| version 1.23 | | version 1.24 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_player_c = | | * static char *rcsid_player_c = |
| * "$Id: player.c,v 1.23 2000/12/04 00:40:05 cvs Exp $"; | | * "$Id: player.c,v 1.24 2000/12/06 07:40:40 cvs Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| if ((op->contr->braced || !move_ob(op,dir,op)) && | | if ((op->contr->braced || !move_ob(op,dir,op)) && |
| !out_of_map(op->map,nx,ny)) { | | !out_of_map(op->map,nx,ny)) { |
| | | |
| op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */ | | |
| | | |
| if ((tmp=get_map_ob(op->map,nx,ny))==NULL) { | | if ((tmp=get_map_ob(op->map,nx,ny))==NULL) { |
| /* LOG(llevError,"player_move_attack: get_map_ob returns NULL, but player can not more there.\n");*/ | | /* LOG(llevError,"player_move_attack: get_map_ob returns NULL, but player can not more there.\n");*/ |
| | |
| ((tmp->type!=PLAYER || op->contr->party_number==-1 || | | ((tmp->type!=PLAYER || op->contr->party_number==-1 || |
| op->contr->party_number!=tmp->contr->party_number))) { | | op->contr->party_number!=tmp->contr->party_number))) { |
| | | |
| | | op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */ |
| | | |
| #ifdef ALLOW_SKILLS | | #ifdef ALLOW_SKILLS |
| skill_attack(tmp, op, 0, NULL); | | skill_attack(tmp, op, 0, NULL); |
| #else | | #else |