diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-17 00:34:31 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-17 00:34:31 +0000 |
| commit | a041cf61134ad4f96e06bdadccb4782546fbddc3 (patch) | |
| tree | 9f33eff632b2b7a49bdd2d931a075a9735430959 /crawl-ref/source/mon-util.cc | |
| parent | 2e69e7194860a07a628afc055016626e320334a1 (diff) | |
| download | crawl-ref-a041cf61134ad4f96e06bdadccb4782546fbddc3.tar.gz crawl-ref-a041cf61134ad4f96e06bdadccb4782546fbddc3.zip | |
Add yet more cleanups.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5899 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mon-util.cc')
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 13dc10e7c4..1dbf56f850 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -2170,6 +2170,11 @@ bool mons_is_caught(const monsters *m) return (m->has_ench(ENCH_HELD)); } +bool mons_is_sleeping(const monsters *m) +{ + return (m->behaviour == BEH_SLEEP); +} + bool mons_is_fleeing(const monsters *m) { return (m->behaviour == BEH_FLEE); @@ -2185,9 +2190,9 @@ bool mons_is_cornered(const monsters *m) return (m->behaviour == BEH_CORNERED); } -bool mons_is_sleeping(const monsters *m) +bool mons_is_lurking(const monsters *m) { - return (m->behaviour == BEH_SLEEP); + return (m->behaviour == BEH_LURK); } bool mons_is_batty(const monsters *m) @@ -4932,7 +4937,7 @@ void monsters::add_enchantment_effect(const mon_enchant &ench, bool quiet) if (has_ench(ENCH_SUBMERGED)) del_ench(ENCH_SUBMERGED); - if (behaviour == BEH_LURK) + if (mons_is_lurking(this)) { behaviour = BEH_WANDER; behaviour_event(this, ME_EVAL); @@ -4976,7 +4981,7 @@ void monsters::add_enchantment_effect(const mon_enchant &ench, bool quiet) if (type == MONS_TRAPDOOR_SPIDER && has_ench(ENCH_SUBMERGED)) del_ench(ENCH_SUBMERGED); - if (behaviour == BEH_LURK) + if (mons_is_lurking(this)) { behaviour = BEH_WANDER; behaviour_event(this, ME_EVAL); @@ -5691,7 +5696,7 @@ void monsters::apply_enchantment(const mon_enchant &me) else if (type == MONS_TRAPDOOR_SPIDER) { // This should probably never happen. - if (behaviour != BEH_LURK) + if (!mons_is_lurking(this)) del_ench(ENCH_SUBMERGED); break; } |