diff options
| -rw-r--r-- | crawl-ref/source/beam.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/mon-util.h | 1 | ||||
| -rw-r--r-- | crawl-ref/source/monster.cc | 10 | ||||
| -rw-r--r-- | crawl-ref/source/spells4.cc | 2 |
5 files changed, 13 insertions, 14 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index bc866e813d..e56f9daf7a 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -2293,7 +2293,7 @@ int mons_adjust_flavoured(monsters *monster, bolt &pbolt, int hurted, } else if (original < hurted && doFlavouredEffects) { - if (mons_is_icy(monster->type)) + if (monster->is_icy()) simple_monster_message(monster, " melts!"); else if (monster->type == MONS_BUSH) simple_monster_message(monster, " is on fire!"); @@ -2491,7 +2491,7 @@ int mons_adjust_flavoured(monsters *monster, bolt &pbolt, int hurted, } else if (hurted > original) { - if (mons_is_icy(monster->type)) + if (monster->is_icy()) { if (doFlavouredEffects) simple_monster_message(monster, " melts!"); @@ -2526,7 +2526,7 @@ int mons_adjust_flavoured(monsters *monster, bolt &pbolt, int hurted, } else if (resist < 0) { - if (mons_is_icy(monster->type)) + if (monster->is_icy()) { if (doFlavouredEffects) simple_monster_message(monster, " melts!"); diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 8c5dcf5423..d0c92dd753 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -565,14 +565,6 @@ bool mons_is_poisoner(const monsters *mon) return (false); } -bool mons_is_icy(int mc) -{ - return (mc == MONS_ICE_BEAST - || mc == MONS_SIMULACRUM_SMALL - || mc == MONS_SIMULACRUM_LARGE - || mc == MONS_ICE_STATUE); -} - // Monsters considered as "slime" for Jiyva. bool mons_class_is_slime(int mc) { diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h index 640d89ddc7..0e2dcfab7a 100644 --- a/crawl-ref/source/mon-util.h +++ b/crawl-ref/source/mon-util.h @@ -633,7 +633,6 @@ bool mons_was_seen(const monsters *m); bool mons_is_known_mimic(const monsters *m); bool mons_is_unknown_mimic(const monsters *m); bool mons_is_holy(const monsters *mon); -bool mons_is_icy(int mc); bool mons_is_skeletal(int mc); bool mons_class_is_slime(int mc); bool mons_is_slime(const monsters *mon); diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc index dda40f100a..b5e92c2cf7 100644 --- a/crawl-ref/source/monster.cc +++ b/crawl-ref/source/monster.cc @@ -5230,9 +5230,17 @@ bool monsters::mutate() return (monster_polymorph(this, RANDOM_MONSTER)); } +static bool _mons_is_icy(int mc) +{ + return (mc == MONS_ICE_BEAST + || mc == MONS_SIMULACRUM_SMALL + || mc == MONS_SIMULACRUM_LARGE + || mc == MONS_ICE_STATUE); +} + bool monsters::is_icy() const { - return (mons_is_icy(type)); + return (_mons_is_icy(type)); } static bool _mons_is_fiery(int mc) diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index 3a513c8bcc..a03c9ca9c1 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -1487,7 +1487,7 @@ bool cast_fragmentation(int pow, const dist& spd) break; default: - if (mons_is_icy(mon->type)) // blast of ice + if (mon->is_icy()) // blast of ice { explode = true; beam.name = "icy blast"; |