From 5cae6a4d1a66d74223cf4b6001b234d24be329d9 Mon Sep 17 00:00:00 2001 From: Vsevolod Kozlov Date: Thu, 5 Nov 2009 21:23:53 +0300 Subject: Replace mons_is_paralysed with monsters::paralysed. Signed-off-by: Robert Vollmert --- crawl-ref/source/beam.cc | 2 +- crawl-ref/source/delay.cc | 2 +- crawl-ref/source/directn.cc | 2 +- crawl-ref/source/effects.cc | 2 +- crawl-ref/source/mon-abil.cc | 2 +- crawl-ref/source/mon-info.cc | 2 +- crawl-ref/source/mon-util.cc | 7 +------ crawl-ref/source/mon-util.h | 1 - crawl-ref/source/monster.cc | 2 +- crawl-ref/source/spells4.cc | 2 +- crawl-ref/source/traps.cc | 2 +- crawl-ref/source/view.cc | 6 +++--- 12 files changed, 13 insertions(+), 19 deletions(-) (limited to 'crawl-ref') diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index d0dd576d5c..6ad38c53f5 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -5192,7 +5192,7 @@ mon_resist_type bolt::apply_enchantment_to_monster(monsters* mon) && !mons_is_stationary(mon) && mon->add_ench(ENCH_HASTE)) { - if (!mons_is_paralysed(mon) && !mons_is_petrified(mon) + if (!mon->paralysed() && !mons_is_petrified(mon) && simple_monster_message(mon, " seems to speed up.")) { obvious_effect = true; diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index c5854a5fad..5784a95c82 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -79,7 +79,7 @@ static bool _recite_mons_useless(const monsters *mon) || mons_wont_attack(mon) || mons_neutral(mon) || mons_is_confused(mon) - || mons_is_paralysed(mon) + || mon->paralysed() || mon->has_ench(ENCH_BATTLE_FRENZY) || mon->has_ench(ENCH_HASTE)); } diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index 033924fc89..4ea97767f0 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -3088,7 +3088,7 @@ static std::string _stair_destination_description(const coord_def &pos) std::string _mon_enchantments_string(const monsters* mon) { - const bool paralysed = mons_is_paralysed(mon); + const bool paralysed = mon->paralysed(); std::vector enchant_descriptors; for (mon_enchant_list::const_iterator e = mon->enchantments.begin(); diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index be30e40cc5..1ba8d89aa7 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -4002,7 +4002,7 @@ static void _catchup_monster_moves(monsters *mon, int turns) } // Let sleeping monsters lie. - if (mon->asleep() || mons_is_paralysed(mon)) + if (mon->asleep() || mon->paralysed()) return; const int range = (turns * mon->speed) / 10; diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc index 1742d00860..7152d78eed 100644 --- a/crawl-ref/source/mon-abil.cc +++ b/crawl-ref/source/mon-abil.cc @@ -330,7 +330,7 @@ static bool _disabled_slime(monsters *thing) return (!thing || mons_is_fleeing(thing) || mons_is_confused(thing) - || mons_is_paralysed(thing)); + || thing->paralysed()); } // See if there are any appropriate adjacent slime creatures for 'thing' diff --git a/crawl-ref/source/mon-info.cc b/crawl-ref/source/mon-info.cc index 8391d64c2e..619a89d4e4 100644 --- a/crawl-ref/source/mon-info.cc +++ b/crawl-ref/source/mon-info.cc @@ -156,7 +156,7 @@ static std::string _verbose_info(const monsters* m) { if (mons_is_petrified(m)) return (" (petrified)"); - if (mons_is_paralysed(m)) + if (m->paralysed()) return (" (paralysed)"); if (mons_is_petrifying(m)) return (" (petrifying)"); diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index ca915daeba..80bfe7ac0e 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -2051,11 +2051,6 @@ mon_attitude_type mons_attitude(const monsters *m) return ATT_HOSTILE; } -bool mons_is_paralysed(const monsters *m) -{ - return (m->has_ench(ENCH_PARALYSIS)); -} - bool mons_is_petrified(const monsters *m) { return (m->has_ench(ENCH_PETRIFIED)); @@ -2068,7 +2063,7 @@ bool mons_is_petrifying(const monsters *m) bool mons_cannot_act(const monsters *m) { - return (mons_is_paralysed(m) + return (m->paralysed() || mons_is_petrified(m) && !mons_is_petrifying(m)); } diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h index 9e9770eadd..88a544a8a8 100644 --- a/crawl-ref/source/mon-util.h +++ b/crawl-ref/source/mon-util.h @@ -676,7 +676,6 @@ bool invalid_monster_type(monster_type mt); bool invalid_monster_index(int i); bool monster_shover(const monsters *m); -bool mons_is_paralysed(const monsters *m); bool mons_is_petrified(const monsters *m); bool mons_is_petrifying(const monsters *m); bool mons_cannot_act(const monsters *m); diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc index 4fb0f265ba..a06fd2e94b 100644 --- a/crawl-ref/source/monster.cc +++ b/crawl-ref/source/monster.cc @@ -2751,7 +2751,7 @@ bool monsters::confused_by_you() const bool monsters::paralysed() const { - return (mons_is_paralysed(this)); + return this->has_ench(ENCH_PARALYSIS); } bool monsters::cannot_act() const diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index 7faa22b550..15566f5cf5 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -2101,7 +2101,7 @@ bool do_slow_monster(monsters* mon, kill_category whose_kill) && !mons_is_stationary(mon) && mon->add_ench(mon_enchant(ENCH_SLOW, 0, whose_kill))) { - if (!mons_is_paralysed(mon) && !mons_is_petrified(mon) + if (!mon->paralysed() && !mons_is_petrified(mon) && simple_monster_message(mon, " seems to slow down.")) { return (true); diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc index 40ad762116..3db80ac806 100644 --- a/crawl-ref/source/traps.cc +++ b/crawl-ref/source/traps.cc @@ -828,7 +828,7 @@ void remove_net_from(monsters *mon) // factor in whether monster is paralysed or invisible int paralys = 0; - if (mons_is_paralysed(mon)) // makes this easier + if (mon->paralysed()) // makes this easier paralys = random2(5); int invis = 0; diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index 8e89b2639b..e032183849 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -328,7 +328,7 @@ static void _good_god_follower_attitude_change(monsters *monster) && !testbits(monster->flags, MF_ATT_CHANGE_ATTEMPT) && !mons_wont_attack(monster) && you.visible_to(monster) && !monster->asleep() - && !mons_is_confused(monster) && !mons_is_paralysed(monster)) + && !mons_is_confused(monster) && !monster->paralysed()) { monster->flags |= MF_ATT_CHANGE_ATTEMPT; @@ -368,7 +368,7 @@ void beogh_follower_convert(monsters *monster, bool orc_hit) && !testbits(monster->flags, MF_ATT_CHANGE_ATTEMPT) && !mons_friendly(monster) && you.visible_to(monster) && !monster->asleep() - && !mons_is_confused(monster) && !mons_is_paralysed(monster)) + && !mons_is_confused(monster) && !monster->paralysed()) { monster->flags |= MF_ATT_CHANGE_ATTEMPT; @@ -403,7 +403,7 @@ void slime_convert(monsters* monster) && !mons_friendly(monster) && !testbits(monster->flags, MF_ATT_CHANGE_ATTEMPT) && you.visible_to(monster) && !monster->asleep() - && !mons_is_confused(monster) && !mons_is_paralysed(monster)) + && !mons_is_confused(monster) && !monster->paralysed()) { monster->flags |= MF_ATT_CHANGE_ATTEMPT; if (!player_under_penance()) -- cgit v1.2.3-54-g00ecf