diff options
| -rw-r--r-- | crawl-ref/source/describe.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/item_use.cc | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 34e22d329a..87ed94b900 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -1094,8 +1094,8 @@ static std::string _describe_ammo( const item_def &item ) break; case SPMSL_SILVER: description += "Compared to normal ammo, it does twice as " - "much damage to the undead, demons, shapeshifters and " - "chaotic beings, and weighs twice as much."; + "much damage to the undead, demons and chaotic beings, " + "and weighs twice as much."; break; } diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 258f03e0bc..e621b1e663 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -1710,17 +1710,17 @@ static bool _item_penetrates_victim(const bolt &beam, const actor *victim, static bool _silver_damages_victim(bolt &beam, actor* victim, int &dmg, std::string &dmg_msg) { - bool shifter_or_chaotic; + bool chaotic; if (victim->atype() == ACT_MONSTER) { monsters* mon = dynamic_cast<monsters*>(victim); - shifter_or_chaotic = mons_is_chaotic(mon); // Includes shapeshifters. + chaotic = mons_is_chaotic(mon); // Includes shapeshifters. } else - shifter_or_chaotic = transform_changed_physiology(); + chaotic = transform_changed_physiology(); - if (shifter_or_chaotic || victim->is_unholy()) + if (chaotic || victim->is_unholy()) { dmg *= 2; |