| version 1.112 | | version 1.113 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_attack_c = | | * static char *rcsid_attack_c = |
| * "$Id: attack.c,v 1.112 2005/09/24 09:28:05 ryo_saeba Exp $"; | | * "$Id: attack.c,v 1.113 2005/09/25 02:15:45 cavesomething Exp $"; |
| */ | | */ |
| /* | | /* |
| CrossFire, A Multiplayer game for X-windows | | CrossFire, A Multiplayer game for X-windows |
| | |
| | | |
| player *pl; | | player *pl; |
| | | |
| int no=owner->contr->party->partyid; | | partylist *party=owner->contr->party; |
| #ifdef PARTY_KILL_LOG | | #ifdef PARTY_KILL_LOG |
| add_kill_to_party(no,query_name(owner),query_name(op),exp); | | add_kill_to_party(party, query_name(owner), query_name(op), exp); |
| #endif | | #endif |
| for(pl=first_player;pl!=NULL;pl=pl->next) { | | for(pl=first_player;pl!=NULL;pl=pl->next) { |
| if(pl->ob->contr->party->partyid==no && on_same_map(pl->ob, owner)) { | | if(party && pl->ob->contr->party==party && on_same_map(pl->ob, owner)) { |
| count++; | | count++; |
| shares+=(pl->ob->level+4); | | shares+=(pl->ob->level+4); |
| } | | } |
| | |
| else { | | else { |
| int share=exp/shares,given=0,nexp; | | int share=exp/shares,given=0,nexp; |
| for(pl=first_player;pl!=NULL;pl=pl->next) { | | for(pl=first_player;pl!=NULL;pl=pl->next) { |
| if(pl->ob->contr->party->partyid==no && on_same_map(pl->ob, owner)) { | | if(party && pl->ob->contr->party==party && on_same_map(pl->ob, owner)) { |
| nexp=(pl->ob->level+4)*share; | | nexp=(pl->ob->level+4)*share; |
| change_exp(pl->ob,nexp, skill, SK_EXP_TOTAL); | | change_exp(pl->ob,nexp, skill, SK_EXP_TOTAL); |
| given+=nexp; | | given+=nexp; |