| version 1.101 | | version 1.102 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_attack_c = | | * static char *rcsid_attack_c = |
| * "$Id: attack.c,v 1.101 2004/09/10 07:03:45 mwedel Exp $"; | | * "$Id: attack.c,v 1.102 2004/12/29 08:45:08 mwedel Exp $"; |
| */ | | */ |
| /* | | /* |
| CrossFire, A Multiplayer game for X-windows | | CrossFire, A Multiplayer game for X-windows |
| | |
| char buf[MAX_BUF], *skill; | | char buf[MAX_BUF], *skill; |
| int maxdam=0; | | int maxdam=0; |
| int battleg=0; /* true if op standing on battleground */ | | int battleg=0; /* true if op standing on battleground */ |
| | | int pk=0; /* true if op and what controls hitter are both players*/ |
| int killed_script_rtn = 0; | | int killed_script_rtn = 0; |
| object *owner=NULL; | | object *owner=NULL; |
| int evtid; | | int evtid; |
| | |
| /* is the victim (op) standing on battleground? */ | | /* is the victim (op) standing on battleground? */ |
| if (op_on_battleground(op, NULL, NULL)) battleg=1; | | if (op_on_battleground(op, NULL, NULL)) battleg=1; |
| | | |
| | | /* is this player killing?*/ |
| | | if (op->type == PLAYER && owner->type == PLAYER) pk=1; |
| | | |
| /* Player killed something */ | | /* Player killed something */ |
| if(owner->type==PLAYER) { | | if(owner->type==PLAYER) { |
| Log_Kill(owner->name, | | Log_Kill(owner->name, |
| | |
| | | |
| /* Pet (or spell) killed something. */ | | /* Pet (or spell) killed something. */ |
| if(owner != hitter ) { | | if(owner != hitter ) { |
| (void) sprintf(buf,"%s killed %s with %s%s.",owner->name, | | (void) sprintf(buf,"%s killed %s with %s%s%s.",owner->name, |
| query_name(op),query_name(hitter), battleg? " (duel)":""); | | query_name(op),query_name(hitter), battleg? " (duel)":"", pk? " (pk)":""); |
| } | | } |
| else { | | else { |
| (void) sprintf(buf,"%s killed %s%s.",hitter->name,op->name, | | (void) sprintf(buf,"%s killed %s in hand to hand combat %s%s.",hitter->name,op->name, |
| battleg? " (duel)":""); | | battleg? " (duel)":"", pk? " (pk)":""); |
| } | | } |
| /* These may have been set in the player code section above */ | | /* These may have been set in the player code section above */ |
| if (!skop) skop = hitter->chosen_skill; | | if (!skop) skop = hitter->chosen_skill; |