| 1 | /* |
1 | /* |
| 2 | * static char *rcsid_attack_c = |
2 | * static char *rcsid_attack_c = |
| 3 | * "$Id: attack.c,v 1.9 2006/03/31 17:20:10 root Exp $"; |
3 | * "$Id: attack.c,v 1.10 2006/03/31 17:33:40 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 |
| … | |
… | |
| 1653 | #ifdef PROHIBIT_PLAYERKILL |
1653 | #ifdef PROHIBIT_PLAYERKILL |
| 1654 | if (op->type == PLAYER) { |
1654 | if (op->type == PLAYER) { |
| 1655 | object *owner = get_owner (hitter); |
1655 | object *owner = get_owner (hitter); |
| 1656 | if (!owner) owner = hitter; |
1656 | if (!owner) owner = hitter; |
| 1657 | if (owner->type == PLAYER |
1657 | if (owner->type == PLAYER |
| 1658 | && (!op_on_battleground (op, 0, 0) || op->contr->peaceful || op->contr->peaceful) |
1658 | && (!op_on_battleground (op, 0, 0) && (op->contr->peaceful || owner->contr->peaceful)) |
| 1659 | && op != owner) { |
1659 | && op != owner) { |
| 1660 | return 0; |
1660 | return 0; |
| 1661 | } |
1661 | } |
| 1662 | } |
1662 | } |
| 1663 | #endif |
1663 | #endif |
