summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player-equip.cc
diff options
context:
space:
mode:
authorNicholas Feinberg <pleasingfung@gmail.com>2014-04-05 21:04:27 -0700
committerShmuale Mark <shm.mark@gmail.com>2014-04-06 01:14:52 -0400
commit456bd4e601bee76cf7d4728fa6ca4d5a159e9f82 (patch)
tree622de09f3a1aaf87ef31c8e590638700904291ee /crawl-ref/source/player-equip.cc
parent63a232999fb6433f0ccbc20a88680cff18a2db57 (diff)
downloadcrawl-ref-456bd4e601bee76cf7d4728fa6ca4d5a159e9f82.tar.gz
crawl-ref-456bd4e601bee76cf7d4728fa6ca4d5a159e9f82.zip
Make lava (& deep water) lethal
Diffstat (limited to 'crawl-ref/source/player-equip.cc')
-rw-r--r--crawl-ref/source/player-equip.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/player-equip.cc b/crawl-ref/source/player-equip.cc
index ca3c3deff2..9fab6fd438 100644
--- a/crawl-ref/source/player-equip.cc
+++ b/crawl-ref/source/player-equip.cc
@@ -1131,10 +1131,10 @@ static void _unequip_armour_effect(item_def& item, bool meld)
// since a permflight item can keep tempflight evocations going
// we should check tempflight here too
if (you.cancellable_flight() && !you.evokable_flight())
- {
you.duration[DUR_FLIGHT] = 0;
- land_player();
- }
+
+ land_player(); // land_player() has a check for airborne()
+
break;
case SPARM_JUMPING: