summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-act.cc
diff options
context:
space:
mode:
authorVsevolod Kozlov <zaba@thorium.homeunix.org>2009-11-08 15:51:58 +0300
committerVsevolod Kozlov <zaba@thorium.homeunix.org>2009-11-08 15:51:58 +0300
commitd43819dd4146ff9efa63da5bfdfd3995adb37a68 (patch)
tree5a47bf62d77c879fca354d42ec1e29443e60894e /crawl-ref/source/mon-act.cc
parent63ee0e170c497f07f8b333e1611c3bc02e4e9fc2 (diff)
downloadcrawl-ref-d43819dd4146ff9efa63da5bfdfd3995adb37a68.tar.gz
crawl-ref-d43819dd4146ff9efa63da5bfdfd3995adb37a68.zip
Replace mons_cannot_move with monsters::cannot_move.
Diffstat (limited to 'crawl-ref/source/mon-act.cc')
-rw-r--r--crawl-ref/source/mon-act.cc4
1 files changed, 2 insertions, 2 deletions
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())
{