diff options
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 7f688c2b2b..c77d13af2c 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -6894,8 +6894,6 @@ static void _swim_or_move_energy(monsters *mon) static void _handle_monster_move(monsters *monster) { - bool brkk = false; - monster->hit_points = std::min(monster->max_hit_points, monster->hit_points); @@ -7169,8 +7167,6 @@ static void _handle_monster_move(monsters *monster) // Calculates mmov based on monster target. _handle_movement(monster); - brkk = false; - if (mons_is_confused(monster) || monster->type == MONS_AIR_ELEMENTAL && mons_is_submerged(monster)) @@ -7191,9 +7187,9 @@ static void _handle_monster_move(monsters *monster) { if (monsters_fight(monster, enemy)) { - brkk = true; mmov.reset(); DEBUG_ENERGY_USE("monsters_fight()"); + continue; } else { @@ -7208,9 +7204,6 @@ static void _handle_monster_move(monsters *monster) } } } - - if (brkk) - continue; } _handle_nearby_ability( monster ); @@ -7306,14 +7299,11 @@ static void _handle_monster_move(monsters *monster) } mmov.reset(); - brkk = true; DEBUG_ENERGY_USE("monsters_fight()"); + continue; } } - if (brkk) - continue; - if (monster->pos() + mmov == you.pos()) { ASSERT(!crawl_state.arena); |