| version 1.64 | | version 1.65 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_skills_c = | | * static char *rcsid_skills_c = |
| * "$Id: skills.c,v 1.64 2005/09/13 06:46:35 mwedel Exp $"; | | * "$Id: skills.c,v 1.65 2005/09/24 09:28:05 ryo_saeba Exp $"; |
| */ | | */ |
| /* | | /* |
| CrossFire, A Multiplayer game for X-windows | | CrossFire, A Multiplayer game for X-windows |
| | |
| new_draw_info_format(NDI_UNIQUE, 0,pl,"You jump into %s%s.", | | new_draw_info_format(NDI_UNIQUE, 0,pl,"You jump into %s%s.", |
| tmp->type == PLAYER ? "" : "the ", tmp->name); | | tmp->type == PLAYER ? "" : "the ", tmp->name); |
| if(tmp->type!=PLAYER || | | if(tmp->type!=PLAYER || |
| (pl->type==PLAYER && pl->contr->party_number==-1) || | | (pl->type==PLAYER && pl->contr->party==NULL) || |
| (pl->type==PLAYER && tmp->type==PLAYER && | | (pl->type==PLAYER && tmp->type==PLAYER && |
| pl->contr->party_number!=tmp->contr->party_number)) | | pl->contr->party!=tmp->contr->party)) |
| exp = skill_attack(tmp,pl,pl->facing,"kicked", skill); /* pl makes an attack */ | | exp = skill_attack(tmp,pl,pl->facing,"kicked", skill); /* pl makes an attack */ |
| stop_jump(pl,i,spaces); | | stop_jump(pl,i,spaces); |
| return exp; /* note that calc_skill_exp() is already called by skill_attack() */ | | return exp; /* note that calc_skill_exp() is already called by skill_attack() */ |