| 1 | /* |
1 | /* |
| 2 | * static char *rcsid_player_c = |
2 | * static char *rcsid_player_c = |
| 3 | * "$Id: player.c,v 1.10 2006/03/24 06:06:23 root Exp $"; |
3 | * "$Id: player.c,v 1.11 2006/03/31 17:33:40 root Exp $"; |
| 4 | */ |
4 | */ |
| 5 | |
5 | |
| 6 | /* |
6 | /* |
| 7 | CrossFire, A Multiplayer game for X-windows |
7 | CrossFire, A Multiplayer game for X-windows |
| 8 | |
8 | |
| … | |
… | |
| 2093 | * attack them either. |
2093 | * attack them either. |
| 2094 | */ |
2094 | */ |
| 2095 | if ((mon->type==PLAYER || mon->enemy != op) && |
2095 | if ((mon->type==PLAYER || mon->enemy != op) && |
| 2096 | (mon->type==PLAYER || QUERY_FLAG(mon,FLAG_UNAGGRESSIVE) || QUERY_FLAG(mon, FLAG_FRIENDLY)) && |
2096 | (mon->type==PLAYER || QUERY_FLAG(mon,FLAG_UNAGGRESSIVE) || QUERY_FLAG(mon, FLAG_FRIENDLY)) && |
| 2097 | ( |
2097 | ( |
| 2098 | #ifndef PROHIBIT_PLAYERKILL |
2098 | #ifdef PROHIBIT_PLAYERKILL |
|
|
2099 | (op->contr->peaceful || (mon->type == PLAYER && mon->contr->peaceful)) && |
|
|
2100 | #else |
| 2099 | op->contr->peaceful && |
2101 | op->contr->peaceful && |
| 2100 | #endif |
2102 | #endif |
| 2101 | !on_battleground |
2103 | !on_battleground |
| 2102 | )) { |
2104 | )) { |
| 2103 | if (!op->contr->braced) { |
2105 | if (!op->contr->braced) { |
