| version 1.128 | | version 1.129 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_attack_c = | | * static char *rcsid_attack_c = |
| * "$Id: attack.c,v 1.128 2006/08/21 20:47:23 qal21 Exp $"; | | * "$Id: attack.c,v 1.129 2006/08/31 07:41:27 mwedel Exp $"; |
| */ | | */ |
| /* | | /* |
| CrossFire, A Multiplayer game for X-windows | | CrossFire, A Multiplayer game for X-windows |
| | |
| } | | } |
| /* Player has been killed! */ | | /* Player has been killed! */ |
| else { | | else { |
| /* Need to run kill_player (just in case, make sure is not wiz) */ | | |
| if (!QUERY_FLAG(op,FLAG_WIZ)) | | |
| kill_player(op); | | |
| if(owner->type==PLAYER) { | | if(owner->type==PLAYER) { |
| snprintf(op->contr->killer, BIG_NAME, "%s the %s",owner->name,owner->contr->title); | | snprintf(op->contr->killer, BIG_NAME, "%s the %s",owner->name,owner->contr->title); |
| } | | } |
| | |
| strncpy(op->contr->killer,hitter->name,BIG_NAME); | | strncpy(op->contr->killer,hitter->name,BIG_NAME); |
| op->contr->killer[BIG_NAME-1]='\0'; | | op->contr->killer[BIG_NAME-1]='\0'; |
| } | | } |
| | | /* Need to run kill_player (just in case, make sure is not wiz) */ |
| | | if (!QUERY_FLAG(op,FLAG_WIZ)) |
| | | kill_player(op); |
| } | | } |
| /* This was return -1 - that doesn't seem correct - if we return -1, process | | /* This was return -1 - that doesn't seem correct - if we return -1, process |
| * continues in the calling function. | | * continues in the calling function. |