diff options
| author | Chris Campbell <chriscampbell89@gmail.com> | 2014-07-09 12:36:50 +0100 |
|---|---|---|
| committer | Chris Campbell <chriscampbell89@gmail.com> | 2014-07-09 14:20:23 +0100 |
| commit | b910be8a8ccb624ec421fa435d13eb0d827e63f1 (patch) | |
| tree | bb9555bb8a60db1d7d97111326ebd1c13cbbe4c1 /crawl-ref/source/ouch.cc | |
| parent | 539e34f489b850f764860c7ca23c38b77964fcc5 (diff) | |
| download | crawl-ref-b910be8a8ccb624ec421fa435d13eb0d827e63f1.tar.gz crawl-ref-b910be8a8ccb624ec421fa435d13eb0d827e63f1.zip | |
Make Ring of Flames melt ice armour while active
Since it claims that it will do so and prevents casting Ozo's Armour and
Condensation Shield.
Diffstat (limited to 'crawl-ref/source/ouch.cc')
| -rw-r--r-- | crawl-ref/source/ouch.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc index 10e030f294..ed6eab80b5 100644 --- a/crawl-ref/source/ouch.cc +++ b/crawl-ref/source/ouch.cc @@ -74,7 +74,7 @@ static NORETURN void _end_game(scorefile_entry &se); -static void _maybe_melt_player_enchantments(beam_type flavour, int damage) +void maybe_melt_player_enchantments(beam_type flavour, int damage) { if (flavour == BEAM_FIRE || flavour == BEAM_LAVA || flavour == BEAM_HELLFIRE || flavour == BEAM_STICKY_FLAME @@ -124,7 +124,7 @@ int check_your_resists(int hurted, beam_type flavour, string source, } if (doEffects) - _maybe_melt_player_enchantments(flavour, hurted); + maybe_melt_player_enchantments(flavour, hurted); switch (flavour) { @@ -431,7 +431,7 @@ void splash_with_acid(int acid_strength, int death_source, bool allow_corrosion, */ void expose_player_to_element(beam_type flavour, int strength, bool slow_cold_blooded) { - _maybe_melt_player_enchantments(flavour, strength ? strength : 10); + maybe_melt_player_enchantments(flavour, strength ? strength : 10); qazlal_element_adapt(flavour, strength); if (flavour == BEAM_COLD && slow_cold_blooded |