diff options
| -rw-r--r-- | crawl-ref/source/fight.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/mon-info.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 9 | ||||
| -rw-r--r-- | crawl-ref/source/mon-util.h | 1 | ||||
| -rw-r--r-- | crawl-ref/source/monster.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/monster.h | 1 | ||||
| -rw-r--r-- | crawl-ref/source/spells4.cc | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 49985fa95e..7403f3c3f6 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -318,7 +318,7 @@ unchivalric_attack_type is_unchivalric_attack(const actor *attacker, unchivalric = UCAT_HELD_IN_NET; // petrifying - if (def && mons_is_petrifying(def)) + if (def && def->petrifying()) unchivalric = UCAT_PETRIFYING; // petrified @@ -1461,7 +1461,7 @@ bool melee_attack::player_hits_monster() || one_chance_in(20) || ((defender->cannot_act() || defender->asleep()) && !one_chance_in(10 + you.skills[SK_STABBING])) - || mons_is_petrifying(defender_as_monster()) + || defender_as_monster()->petrifying() && !one_chance_in(2 + you.skills[SK_STABBING])); } diff --git a/crawl-ref/source/mon-info.cc b/crawl-ref/source/mon-info.cc index 24bfd8c7e9..55d47f1387 100644 --- a/crawl-ref/source/mon-info.cc +++ b/crawl-ref/source/mon-info.cc @@ -158,7 +158,7 @@ static std::string _verbose_info(const monsters* m) return (" (petrified)"); if (m->paralysed()) return (" (paralysed)"); - if (mons_is_petrifying(m)) + if (m->petrifying()) return (" (petrifying)"); if (mons_is_confused(m)) return (" (confused)"); diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index f4b182bd1b..f54a6e09e1 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -1938,20 +1938,15 @@ mon_attitude_type mons_attitude(const monsters *m) return ATT_HOSTILE; } -bool mons_is_petrifying(const monsters *m) -{ - return (m->has_ench(ENCH_PETRIFYING)); -} - bool mons_cannot_act(const monsters *m) { return (m->paralysed() - || m->petrified() && !mons_is_petrifying(m)); + || m->petrified() && !m->petrifying()); } bool mons_cannot_move(const monsters *m) { - return (mons_cannot_act(m) || mons_is_petrifying(m)); + return (mons_cannot_act(m) || m->petrifying()); } bool mons_is_confused(const monsters *m, bool class_too) diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h index 6565f7b79b..b356b06fb3 100644 --- a/crawl-ref/source/mon-util.h +++ b/crawl-ref/source/mon-util.h @@ -664,7 +664,6 @@ bool invalid_monster_type(monster_type mt); bool invalid_monster_index(int i); bool monster_shover(const monsters *m); -bool mons_is_petrifying(const monsters *m); bool mons_cannot_act(const monsters *m); bool mons_cannot_move(const monsters *m); diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc index b088be9a35..ed32a9e951 100644 --- a/crawl-ref/source/monster.cc +++ b/crawl-ref/source/monster.cc @@ -2819,6 +2819,11 @@ bool monsters::petrified() const return has_ench(ENCH_PETRIFIED); } +bool monsters::petrifying() const +{ + return has_ench(ENCH_PETRIFYING); +} + bool monsters::friendly() const { return (attitude == ATT_FRIENDLY || has_ench(ENCH_CHARM)); diff --git a/crawl-ref/source/monster.h b/crawl-ref/source/monster.h index 235f4053da..b811059b73 100644 --- a/crawl-ref/source/monster.h +++ b/crawl-ref/source/monster.h @@ -334,6 +334,7 @@ public: bool backlit(bool check_haloed = true) const; int halo_radius() const; bool petrified() const; + bool petrifying() const; bool friendly() const; bool neutral() const; diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc index a03c9ca9c1..fd0dd6ab07 100644 --- a/crawl-ref/source/spells4.cc +++ b/crawl-ref/source/spells4.cc @@ -1525,7 +1525,7 @@ bool cast_fragmentation(int pow, const dist& spd) } else { - const bool petrifying = mons_is_petrifying(mon); + const bool petrifying = mon->petrifying(); const bool petrified = mon->petrified() && !petrifying; // Petrifying or petrified monsters can be exploded. |