[Hide Content]From 1eb2faa9639bbf35a030ecb7ba0d99a908b861d8 Mon Sep 17 00:00:00 2001
From: Steve Melenchuk <smelenchuk@gmail.com>
Date: Sat, 7 Jul 2012 14:14:10 -0600
Subject: [PATCH] Don't generate overly verbose death messages for lava-cooked
felids.
It was possible to see both "You die..." and "You drown..." back-to-back
by burning to death in lava; the handling for this didn't account for
the felid case of the code path continuing after an instant death.
---
crawl-ref/source/terrain.cc | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/crawl-ref/source/terrain.cc b/crawl-ref/source/terrain.cc
index 0c1f967..ee3ea02 100644
--- a/crawl-ref/source/terrain.cc
+++ b/crawl-ref/source/terrain.cc
@@ -1431,6 +1431,9 @@ bool fall_into_a_pool(const coord_def& entry, bool allow_shift,
{
mpr("The lava burns you to a cinder!");
ouch(INSTANT_DEATH, NON_MONSTER, KILLED_BY_LAVA);
+
+ if (you.dead) // felids
+ return false;
}
else
{
@@ -1448,6 +1451,9 @@ bool fall_into_a_pool(const coord_def& entry, bool allow_shift,
mpr("The lava scalds you!");
ouch(damage, NON_MONSTER, KILLED_BY_LAVA);
+
+ if (you.dead) // felids
+ return false;
}
expose_player_to_element(BEAM_LAVA, 14);
--
1.7.8.6