diff options
| author | Eino Keskitalo <evktalo@users.sourceforge.net> | 2009-11-07 16:30:52 +0200 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-07 23:21:21 -0600 |
| commit | 1c0a611a9e00fc789a8e71f1423e48bec7dd5020 (patch) | |
| tree | b73d3be502e13ec1bb56e89e5382fd14f71a74ba /crawl-ref/source/fight.cc | |
| parent | ee4d8d69cdded564187651f879b618a4fc2538f9 (diff) | |
| download | crawl-ref-1c0a611a9e00fc789a8e71f1423e48bec7dd5020.tar.gz crawl-ref-1c0a611a9e00fc789a8e71f1423e48bec7dd5020.zip | |
Merge from chaotic_experiment branch:
Replace mons_is_shapeshifter(const monsters *m) in mon-util.cc with is_shapeshifter() in monster.cc
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index a928168445..7f24fa9386 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -877,7 +877,7 @@ bool melee_attack::player_attack() if (you.religion == GOD_BEOGH && defender->mons_species() == MONS_ORC && !defender->is_summoned() - && !mons_is_shapeshifter(defender_as_monster()) + && !defender_as_monster()->is_shapeshifter() && !player_under_penance() && you.piety >= piety_breakpoint(2) && mons_near(defender_as_monster()) && defender->asleep()) { @@ -2337,7 +2337,7 @@ void melee_attack::chaos_affects_defender() const bool mon = defender->atype() == ACT_MONSTER; const bool immune = mon && mons_immune_magic(defender_as_monster()); const bool is_natural = mon && defender->holiness() == MH_NATURAL; - const bool is_shifter = mon && mons_is_shapeshifter(defender_as_monster()); + const bool is_shifter = mon && defender_as_monster()->is_shapeshifter(); const bool can_clone = mon && defender->holiness() == MH_HOLY && mons_clonable(defender_as_monster(), true); const bool can_poly = is_shifter || (defender->can_safely_mutate() |