Difference for server/monster.c from version 1.81 to 1.82

version 1.81 version 1.82
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_monster_c =   * static char *rcsid_monster_c =
  *    "$Id: monster.c,v 1.81 2005/07/17 04:19:49 qal21 Exp $";   *    "$Id: monster.c,v 1.82 2005/07/28 07:23:19 qal21 Exp $";
  */   */
   
 /*  /*
Line 81
 
Line 81
  npc->enemy = NULL;   npc->enemy = NULL;
   
   else if (QUERY_FLAG(npc, FLAG_FRIENDLY) && (    else if (QUERY_FLAG(npc, FLAG_FRIENDLY) && (
  (QUERY_FLAG(npc->enemy, FLAG_FRIENDLY) && !(   (QUERY_FLAG(npc->enemy, FLAG_FRIENDLY) && !(should_arena_attack(npc, npc->owner, npc->enemy))) ||
  (npc->owner != npc->enemy->owner) &&   ((npc->enemy->type == PLAYER) && !(should_arena_attack(npc, npc->owner, npc->enemy)))
  op_on_battleground(npc, NULL, NULL) &&   
  op_on_battleground(npc->owner, NULL, NULL) &&   
  op_on_battleground(npc->enemy, NULL, NULL) &&   
  (npc->owner->contr->petmode == pet_arena) && !(  
  (npc->enemy->owner->contr->party_number ==   
  npc->owner->contr->party_number) &&   
  (npc->owner->contr->party_number > 0)))) ||   
  ((npc->enemy->type == PLAYER) && !(  
  op_on_battleground(npc, NULL, NULL) &&   
  op_on_battleground(npc->owner, NULL, NULL) &&   
  op_on_battleground(npc->enemy, NULL, NULL) &&   
  (npc->owner->contr->petmode == pet_arena) && !(  
  (npc->enemy->contr->party_number ==   
  npc->owner->contr->party_number) &&   
  (npc->owner->contr->party_number > 0))))   
  || npc->enemy == npc->owner))   || npc->enemy == npc->owner))
   npc->enemy = NULL;    npc->enemy = NULL;
            

Legend:
line(s) removed in v.1.81 
line(s) changed
 line(s) added in v.1.82
File made using version 1.98 of cvs2html by leaf at 2011-07-21 17:37