| version 1.65 | | version 1.66 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_skill_util_c = | | * static char *rcsid_skill_util_c = |
| * "$Id: skill_util.c,v 1.65 2006/05/05 09:26:35 ryo_saeba Exp $"; | | * "$Id: skill_util.c,v 1.66 2006/05/26 22:29:07 akirschbaum Exp $"; |
| */ | | */ |
| /* | | /* |
| CrossFire, A Multiplayer game for X-windows | | CrossFire, A Multiplayer game for X-windows |
| | |
| if (mflags & P_OUT_OF_MAP) return 0; | | if (mflags & P_OUT_OF_MAP) return 0; |
| | | |
| /* space must be blocked for there to be anything interesting to do */ | | /* space must be blocked for there to be anything interesting to do */ |
| if (!OB_TYPE_MOVE_BLOCK(pl, GET_MAP_MOVE_BLOCK(m, tx,ty))) return 0; | | if (!(mflags&P_IS_ALIVE) |
| | | && !OB_TYPE_MOVE_BLOCK(pl, GET_MAP_MOVE_BLOCK(m, tx, ty))) { |
| | | return 0; |
| | | } |
| | | |
| for(tmp=get_map_ob(m, tx, ty); tmp; tmp=tmp->above) | | for(tmp=get_map_ob(m, tx, ty); tmp; tmp=tmp->above) |
| if((QUERY_FLAG(tmp,FLAG_ALIVE) && tmp->stats.hp>=0) | | if((QUERY_FLAG(tmp,FLAG_ALIVE) && tmp->stats.hp>=0) |