| version 1.55 | | version 1.56 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_skill_util_c = | | * static char *rcsid_skill_util_c = |
| * "$Id: skill_util.c,v 1.55 2005/08/12 13:46:34 ryo_saeba Exp $"; | | * "$Id: skill_util.c,v 1.56 2005/09/24 09:28:05 ryo_saeba Exp $"; |
| */ | | */ |
| /* | | /* |
| CrossFire, A Multiplayer game for X-windows | | CrossFire, A Multiplayer game for X-windows |
| | |
| || QUERY_FLAG(tmp, FLAG_CAN_ROLL) | | || QUERY_FLAG(tmp, FLAG_CAN_ROLL) |
| || tmp->type==LOCKED_DOOR ) { | | || tmp->type==LOCKED_DOOR ) { |
| /* Don't attack party members */ | | /* Don't attack party members */ |
| if((pl->type==PLAYER && tmp->type==PLAYER) && (pl->contr->party_number!=-1 | | if((pl->type==PLAYER && tmp->type==PLAYER) && (pl->contr->party!=NULL |
| && pl->contr->party_number==tmp->contr->party_number)) | | && pl->contr->party==tmp->contr->party)) |
| return 0; | | return 0; |
| break; | | break; |
| } | | } |