diff options
| author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-22 10:01:35 +0000 |
|---|---|---|
| committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-11-22 10:01:35 +0000 |
| commit | d473edf767361c19d6938c48ebd518f7d68824c1 (patch) | |
| tree | 23ebe65e4e8df543a0160c3158e2c3524b16d3cc /crawl-ref/source/spells1.cc | |
| parent | 8f6c276eff93a39b5b0cc19d1e62423bafcd5347 (diff) | |
| download | crawl-ref-d473edf767361c19d6938c48ebd518f7d68824c1.tar.gz crawl-ref-d473edf767361c19d6938c48ebd518f7d68824c1.zip | |
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
Diffstat (limited to 'crawl-ref/source/spells1.cc')
| -rw-r--r-- | crawl-ref/source/spells1.cc | 7 |
1 files changed, 7 insertions, 0 deletions
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 ) |