version 1.80 | | version 1.81 |
---|
| | |
/* | | /* |
* static char *rcsid_monster_c = | | * static char *rcsid_monster_c = |
* "$Id: monster.c,v 1.80 2005/07/16 21:10:39 akirschbaum Exp $"; | | * "$Id: monster.c,v 1.81 2005/07/17 04:19:49 qal21 Exp $"; |
*/ | | */ |
| | |
/* | | /* |
| | |
| | |
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) && !( |
| | (npc->owner != npc->enemy->owner) && |
op_on_battleground(npc, NULL, NULL) && | | op_on_battleground(npc, NULL, NULL) && |
op_on_battleground(npc->owner, NULL, NULL) && | | op_on_battleground(npc->owner, NULL, NULL) && |
op_on_battleground(npc->enemy, NULL, NULL) && | | op_on_battleground(npc->enemy, NULL, NULL) && |