From b0afcc8dd38ff00d80b4955bdc2f12c3a843c594 Mon Sep 17 00:00:00 2001 From: haranp Date: Tue, 3 Feb 2009 18:02:39 +0000 Subject: Fix [2504221]: if a monster gets both Slow and Haste (by being slowed and then speeding up from Zin's Recitation power) don't give a confusing description. I left in the possibility of actually having both enchantments at once; arguably Slow should just be deleted in this case. Fixed doubled message when enchanting a creature with haste/slow. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8882 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/beam.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/beam.cc') diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 594f241155..b037cc74f4 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -4822,7 +4822,7 @@ mon_resist_type bolt::apply_enchantment_to_monster(monsters* mon) case BEAM_SLOW: // try to remove haste, if monster is hasted - if (mon->del_ench(ENCH_HASTE)) + if (mon->del_ench(ENCH_HASTE, true)) { if (simple_monster_message(mon, " is no longer moving quickly.")) obvious_effect = true; @@ -4843,7 +4843,7 @@ mon_resist_type bolt::apply_enchantment_to_monster(monsters* mon) return (MON_AFFECTED); case BEAM_HASTE: - if (mon->del_ench(ENCH_SLOW)) + if (mon->del_ench(ENCH_SLOW, true)) { if (simple_monster_message(mon, " is no longer moving slowly.")) obvious_effect = true; -- cgit v1.2.3-54-g00ecf