| version 1.78 | | version 1.79 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_monster_c = | | * static char *rcsid_monster_c = |
| * "$Id: monster.c,v 1.78 2005/07/14 16:21:34 ryo_saeba Exp $"; | | * "$Id: monster.c,v 1.79 2005/07/16 19:03:01 qal21 Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| QUERY_FLAG(npc->enemy, FLAG_NEUTRAL)) | | QUERY_FLAG(npc->enemy, FLAG_NEUTRAL)) |
| 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) && !( |
| npc->enemy->type == PLAYER || npc->enemy == npc->owner)) | | 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 = NULL; | | npc->enemy = NULL; |
| | | |
| | | |
| else if (!QUERY_FLAG(npc, FLAG_FRIENDLY) && | | else if (!QUERY_FLAG(npc, FLAG_FRIENDLY) && |
| (!QUERY_FLAG(npc->enemy, FLAG_FRIENDLY) && npc->enemy->type!=PLAYER)) | | (!QUERY_FLAG(npc->enemy, FLAG_FRIENDLY) && npc->enemy->type!=PLAYER)) |
| npc->enemy=NULL; | | npc->enemy=NULL; |