From d473edf767361c19d6938c48ebd518f7d68824c1 Mon Sep 17 00:00:00 2001 From: zelgadis Date: Sat, 22 Nov 2008 10:01:35 +0000 Subject: Fix bug 2325392: Ring of Flames interface problems. Whether stepping into a potentially damaging cloud prompts or not now takes into consideration temporary resistances and immunties, where before it only took into account permanent ones. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7535 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/spells1.cc | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'crawl-ref/source/spells1.cc') diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc index 6675c9019d..7d850ba0b5 100644 --- a/crawl-ref/source/spells1.cc +++ b/crawl-ref/source/spells1.cc @@ -1513,10 +1513,17 @@ bool cast_sure_blade(int power) void manage_fire_shield() { + ASSERT(you.duration[DUR_FIRE_SHIELD]); you.duration[DUR_FIRE_SHIELD]--; if (!you.duration[DUR_FIRE_SHIELD]) + { + mpr("Your ring of flames gutters out.", MSGCH_DURATION); return; + } + + if (you.duration[DUR_FIRE_SHIELD] == 5) + mpr("Your ring of flames is guttering out.", MSGCH_WARN); // Place fire clouds all around you for ( adjacent_iterator ai; ai; ++ai ) -- cgit v1.2.3-54-g00ecf