diff options
| -rw-r--r-- | crawl-ref/source/behold.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/mon-act.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/mon-util.h | 1 | ||||
| -rw-r--r-- | crawl-ref/source/monplace.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/monster.cc | 2 |
6 files changed, 5 insertions, 11 deletions
diff --git a/crawl-ref/source/behold.cc b/crawl-ref/source/behold.cc index bcbacace1e..7f649f888b 100644 --- a/crawl-ref/source/behold.cc +++ b/crawl-ref/source/behold.cc @@ -166,7 +166,7 @@ bool player::_possible_beholder(const monsters *mon) const return (false); if (!mon->alive() || mons_genus(mon->type) != MONS_MERMAID || !mons_near(mon) || mon->friendly() - || mon->submerged() || mon->confused() || mons_cannot_move(mon) + || mon->submerged() || mon->confused() || mon->cannot_move() || mon->asleep() || silenced(mon->pos())) { return (false); diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc index 4d49b7f266..31e094f37f 100644 --- a/crawl-ref/source/mon-act.cc +++ b/crawl-ref/source/mon-act.cc @@ -2039,7 +2039,7 @@ static void _handle_monster_move(monsters *monster) continue; } - if (mons_cannot_move(monster) || !_monster_move(monster)) + if (monster->cannot_move() || !_monster_move(monster)) monster->speed_increment -= non_move_energy; } you.update_beholder(monster); @@ -2715,7 +2715,7 @@ static bool _mons_can_displace(const monsters *mpusher, // past, either, but they may be woken up by a crowd trying to // elbow past them, and the wake-up check happens downstream. if (mons_is_confused(mpusher) || mons_is_confused(mpushee) - || mons_cannot_move(mpusher) || mons_cannot_move(mpushee) + || mpusher->cannot_move() || mpushee->cannot_move() || mons_is_stationary(mpusher) || mons_is_stationary(mpushee) || mpusher->asleep()) { diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index f54a6e09e1..91f5094636 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -1944,11 +1944,6 @@ bool mons_cannot_act(const monsters *m) || m->petrified() && !m->petrifying()); } -bool mons_cannot_move(const monsters *m) -{ - return (mons_cannot_act(m) || m->petrifying()); -} - bool mons_is_confused(const monsters *m, bool class_too) { return (m->has_ench(ENCH_CONFUSION) diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h index b356b06fb3..f8b499208f 100644 --- a/crawl-ref/source/mon-util.h +++ b/crawl-ref/source/mon-util.h @@ -665,7 +665,6 @@ bool invalid_monster_index(int i); bool monster_shover(const monsters *m); bool mons_cannot_act(const monsters *m); -bool mons_cannot_move(const monsters *m); bool monster_senior(const monsters *first, const monsters *second, bool fleeing = false); diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc index e354a6e869..0f56d02749 100644 --- a/crawl-ref/source/monplace.cc +++ b/crawl-ref/source/monplace.cc @@ -119,7 +119,7 @@ bool monster_habitable_grid(const monsters *m, : m->type; return (monster_habitable_grid(montype, actual_grid, mons_flies(m), - mons_cannot_move(m))); + m->cannot_move())); } inline static bool _mons_airborne(int mcls, int flies, bool paralysed) diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc index ed32a9e951..9327548e89 100644 --- a/crawl-ref/source/monster.cc +++ b/crawl-ref/source/monster.cc @@ -2795,7 +2795,7 @@ bool monsters::cannot_act() const bool monsters::cannot_move() const { - return (mons_cannot_move(this)); + return (cannot_act() || petrifying()); } bool monsters::asleep() const |