| version 1.41 | | version 1.42 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_map_c = | | * static char *rcsid_map_c = |
| * "$Id: map.c,v 1.41 2002/09/07 05:55:18 mwedel Exp $"; | | * "$Id: map.c,v 1.42 2002/09/16 04:07:42 mwedel Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| */ | | */ |
| for(tmp = GET_MAP_OB(m,x,y); tmp!= NULL; tmp = tmp->above) { | | for(tmp = GET_MAP_OB(m,x,y); tmp!= NULL; tmp = tmp->above) { |
| | | |
| if (QUERY_FLAG(tmp,FLAG_NO_PASS) || (QUERY_FLAG(tmp,FLAG_ALIVE) && | | |
| tmp->head != ob && tmp != ob && tmp->type != DOOR)) | | |
| return 1; | | |
| | | |
| /* This must be before the checks below. Code for inventory checkers. */ | | /* This must be before the checks below. Code for inventory checkers. */ |
| if (tmp->type==CHECK_INV && QUERY_FLAG(tmp,FLAG_NO_PASS)) { | | if (tmp->type==CHECK_INV && QUERY_FLAG(tmp,FLAG_NO_PASS)) { |
| /* If last_sp is set, the player/monster needs an object, | | /* If last_sp is set, the player/monster needs an object, |
| | |
| continue; | | continue; |
| } | | } |
| } /* if check_inv */ | | } /* if check_inv */ |
| | | else if (QUERY_FLAG(tmp,FLAG_NO_PASS) || (QUERY_FLAG(tmp,FLAG_ALIVE) && |
| | | tmp->head != ob && tmp != ob && tmp->type != DOOR)) |
| | | return 1; |
| | | |
| } | | } |
| return 0; | | return 0; |
| } | | } |