| … | |
… | |
| 1225 | if (nx < 0 || ny < 0 || nx > MAGIC_MAP_SIZE || ny > MAGIC_MAP_SIZE) |
1225 | if (nx < 0 || ny < 0 || nx > MAGIC_MAP_SIZE || ny > MAGIC_MAP_SIZE) |
| 1226 | continue; |
1226 | continue; |
| 1227 | |
1227 | |
| 1228 | if (map_mark[nx + MAGIC_MAP_SIZE * ny] & FACE_FLOOR) |
1228 | if (map_mark[nx + MAGIC_MAP_SIZE * ny] & FACE_FLOOR) |
| 1229 | { |
1229 | { |
| 1230 | stack = get_map_ob (op->map, i, j); |
1230 | stack = GET_MAP_OB (op->map, i, j); |
| 1231 | |
1231 | |
| 1232 | while (stack) |
1232 | while (stack) |
| 1233 | { |
1233 | { |
| 1234 | if (QUERY_FLAG (stack, FLAG_UNPAID)) |
1234 | if (QUERY_FLAG (stack, FLAG_UNPAID)) |
| 1235 | { |
1235 | { |
| … | |
… | |
| 1289 | |
1289 | |
| 1290 | /* elmex: this function checks whether we are in a shop or not */ |
1290 | /* elmex: this function checks whether we are in a shop or not */ |
| 1291 | bool |
1291 | bool |
| 1292 | is_in_shop (maptile *map, int x, int y) |
1292 | is_in_shop (maptile *map, int x, int y) |
| 1293 | { |
1293 | { |
| 1294 | for (object *floor = get_map_ob (map, x, y); floor; floor = floor->above) |
1294 | for (object *floor = GET_MAP_OB (map, x, y); floor; floor = floor->above) |
| 1295 | if (floor->type == SHOP_FLOOR) |
1295 | if (floor->type == SHOP_FLOOR) |
| 1296 | return true; |
1296 | return true; |
| 1297 | |
1297 | |
| 1298 | return false; |
1298 | return false; |
| 1299 | } |
1299 | } |
