| … | |
… | |
| 434 | /* don't bother searching this square unless the map says life exists. */ |
434 | /* don't bother searching this square unless the map says life exists. */ |
| 435 | if (GET_MAP_FLAGS (map, lx, ly) & P_IS_ALIVE) |
435 | if (GET_MAP_FLAGS (map, lx, ly) & P_IS_ALIVE) |
| 436 | { |
436 | { |
| 437 | object *the_monster = GET_MAP_OB (map, lx, ly); |
437 | object *the_monster = GET_MAP_OB (map, lx, ly); |
| 438 | |
438 | |
| 439 | for (; the_monster != NULL && (!QUERY_FLAG (the_monster, FLAG_MONSTER)); the_monster = the_monster->above); |
439 | for (; the_monster != NULL && (!the_monster->flag [FLAG_MONSTER]); the_monster = the_monster->above); |
| 440 | if (the_monster && QUERY_FLAG (the_monster, FLAG_MONSTER)) |
440 | if (the_monster && the_monster->flag [FLAG_MONSTER]) |
| 441 | return the_monster; |
441 | return the_monster; |
| 442 | } |
442 | } |
| 443 | } |
443 | } |
| 444 | return NULL; |
444 | return NULL; |
| 445 | } |
445 | } |
| … | |
… | |
| 473 | if (GET_MAP_FLAGS (map, x, y) & P_IS_ALIVE) |
473 | if (GET_MAP_FLAGS (map, x, y) & P_IS_ALIVE) |
| 474 | { |
474 | { |
| 475 | object *the_monster = GET_MAP_OB (map, x, y); |
475 | object *the_monster = GET_MAP_OB (map, x, y); |
| 476 | |
476 | |
| 477 | /* check off this point */ |
477 | /* check off this point */ |
| 478 | for (; the_monster != NULL && (!QUERY_FLAG (the_monster, FLAG_ALIVE)); the_monster = the_monster->above); |
478 | for (; the_monster != NULL && (!the_monster->flag [FLAG_ALIVE]); the_monster = the_monster->above); |
| 479 | if (the_monster && QUERY_FLAG (the_monster, FLAG_ALIVE)) |
479 | if (the_monster && the_monster->flag [FLAG_ALIVE]) |
| 480 | { |
480 | { |
| 481 | theMonsterToFind = the_monster; |
481 | theMonsterToFind = the_monster; |
| 482 | return theMonsterToFind; |
482 | return theMonsterToFind; |
| 483 | } |
483 | } |
| 484 | } |
484 | } |
