| 1 | /* |
1 | /* |
| 2 | * static char *rcsid_attack_c = |
2 | * static char *rcsid_attack_c = |
| 3 | * "$Id: attack.c,v 1.5 2006/03/24 10:51:18 root Exp $"; |
3 | * "$Id: attack.c,v 1.6 2006/03/26 08:32:11 root Exp $"; |
| 4 | */ |
4 | */ |
| 5 | /* |
5 | /* |
| 6 | CrossFire, A Multiplayer game for X-windows |
6 | CrossFire, A Multiplayer game for X-windows |
| 7 | |
7 | |
| 8 | Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
8 | Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
| … | |
… | |
| 1657 | |
1657 | |
| 1658 | #ifdef PROHIBIT_PLAYERKILL |
1658 | #ifdef PROHIBIT_PLAYERKILL |
| 1659 | if (op->type == PLAYER) { |
1659 | if (op->type == PLAYER) { |
| 1660 | object *owner = get_owner (hitter); |
1660 | object *owner = get_owner (hitter); |
| 1661 | if (!owner) owner = hitter; |
1661 | if (!owner) owner = hitter; |
| 1662 | if (owner->type == PLAYER && !op_on_battleground (op, 0, 0)) { |
1662 | if (owner->type == PLAYER |
|
|
1663 | && !op_on_battleground (op, 0, 0) |
|
|
1664 | && op != owner) { |
| 1663 | return 0; |
1665 | return 0; |
| 1664 | } |
1666 | } |
| 1665 | } |
1667 | } |
| 1666 | #endif |
1668 | #endif |
| 1667 | |
1669 | |
