| … | |
… | |
| 575 | mflags = get_map_flags (m, &m, x, y, &x, &y); |
575 | mflags = get_map_flags (m, &m, x, y, &x, &y); |
| 576 | |
576 | |
| 577 | if (mflags & P_OUT_OF_MAP) |
577 | if (mflags & P_OUT_OF_MAP) |
| 578 | continue; |
578 | continue; |
| 579 | |
579 | |
| 580 | for (victim = GET_MAP_OB (op->map, x, y); victim; victim = victim->above) |
580 | for (victim = GET_MAP_OB (m, x, y); victim; victim = victim->above) |
| 581 | if (QUERY_FLAG (victim, FLAG_ALIVE)) |
581 | if (QUERY_FLAG (victim, FLAG_ALIVE)) |
| 582 | break; |
582 | break; |
| 583 | |
583 | |
| 584 | /* We used to call will_hit_self to make sure we don't |
584 | /* We used to call will_hit_self to make sure we don't |
| 585 | * hit ourselves, but that didn't work, and I don't really |
585 | * hit ourselves, but that didn't work, and I don't really |
