summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/fight.cc11
-rw-r--r--crawl-ref/source/mon-util.cc2
2 files changed, 7 insertions, 6 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 2d0dc36a12..c7df516e7c 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -2065,13 +2065,14 @@ int resist_adjust_damage(actor *defender, beam_type flavour,
resistible = 0;
else
{
- // Check if this is a resist that pretends to be boolean for damage
- // purposes. Only electricity and sticky flame (napalm) do this at
- // the moment; raw poison damage uses the normal formula.
+ // Check if this is a resist that pretends to be boolean for
+ // damage purposes. Only electricity, miasma and sticky
+ // flame (napalm) do this at the moment; raw poison damage
+ // uses the normal formula.
const int bonus_res = (is_boolean_resist(flavour) ? 1 : 0);
- // Use a new formula for players, but keep the old, more effective
- // for monsters.
+ // Use a new formula for players, but keep the old, more
+ // effective one for monsters.
if (monster)
resistible /= 1 + bonus_res + res * res;
else
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 718d0bcd5f..a4394ac806 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -1318,7 +1318,7 @@ bool mons_res_asphyx(const monsters *mon)
int mons_res_acid(const monsters *mon)
{
- return get_mons_resists(mon).acid;
+ return (get_mons_resists(mon).acid);
}
int mons_res_poison(const monsters *mon)