diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-09-25 00:02:22 -0500 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-09-25 00:02:22 -0500 |
| commit | 4b6eba016a3f7edd8513d032b2b78fe281148c80 (patch) | |
| tree | b2eab409a28c73b13787b32aee466086290c2c3e /crawl-ref | |
| parent | c5811dc9575f38379451e5eac83cc0cbb0ec81a3 (diff) | |
| download | crawl-ref-4b6eba016a3f7edd8513d032b2b78fe281148c80.tar.gz crawl-ref-4b6eba016a3f7edd8513d032b2b78fe281148c80.zip | |
Simplify.
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/beam.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/fight.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/player.cc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index c22ba8ad09..7cf0d381d1 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -2715,7 +2715,7 @@ bool napalm_monster(monsters *monster, kill_category who, int levels, if (!monster->alive()) return (false); - if (mons_res_sticky_flame(monster) > 0 || levels <= 0) + if (mons_res_sticky_flame(monster) || levels <= 0) return (false); const mon_enchant old_flame = monster->get_ench(ENCH_STICKY_FLAME); diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 4bb268ee4a..0e09506670 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -4448,7 +4448,7 @@ void melee_attack::mons_do_poison(const mon_attack_def &attk) void melee_attack::mons_do_napalm() { - if (defender->res_sticky_flame() > 0) + if (defender->res_sticky_flame()) return; if (one_chance_in(20) || (damage_done > 2 && one_chance_in(3))) diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index b89848114c..58101f895b 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -5406,7 +5406,7 @@ bool curare_hits_player(int death_source, int amount) int hurted = 0; - if (player_res_asphyx() > 0) + if (player_res_asphyx()) { hurted = roll_dice(2, 6); @@ -5508,7 +5508,7 @@ bool napalm_player(int amount) { ASSERT(!crawl_state.arena); - if (player_res_sticky_flame() > 0 || amount <= 0) + if (player_res_sticky_flame() || amount <= 0) return (false); const int old_value = you.duration[DUR_LIQUID_FLAMES]; |