summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/dat/clua/lm_timed.lua
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-14 06:02:16 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-14 06:02:16 +0000
commitc2e5ac10de27cdd04b80c120368b3b53eff5ce9d (patch)
treeadaa61ddfe451264f881bca585809864323db078 /crawl-ref/source/dat/clua/lm_timed.lua
parent13ad9f1840a006ff68038615872ca48c3d160e07 (diff)
downloadcrawl-ref-c2e5ac10de27cdd04b80c120368b3b53eff5ce9d.tar.gz
crawl-ref-c2e5ac10de27cdd04b80c120368b3b53eff5ce9d.zip
Bug 1992619: if the player hit '>' on a labyrinth entracnce right before it
timed out, then the entrance *would* time out during the stair climbing delay, removing the marker before the delay ended and thus preventing the player from entering. Now timed feature markers check for this, in which case the marker isn't deleted and a message of "The foo vanishes just as you enter it!" is given. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5809 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/dat/clua/lm_timed.lua')
-rw-r--r--crawl-ref/source/dat/clua/lm_timed.lua9
1 files changed, 9 insertions, 0 deletions
diff --git a/crawl-ref/source/dat/clua/lm_timed.lua b/crawl-ref/source/dat/clua/lm_timed.lua
index a66448c4f8..71d26bdad2 100644
--- a/crawl-ref/source/dat/clua/lm_timed.lua
+++ b/crawl-ref/source/dat/clua/lm_timed.lua
@@ -52,6 +52,15 @@ end
function TimedMarker:timeout(marker, verbose, affect_player)
local x, y = marker:pos()
+
+ if you.pos() == marker:pos() and you.taking_stairs() then
+ if verbose then
+ crawl.mpr( dgn.feature_desc_at(x, y, "The") .. " vanishes " ..
+ "just as you enter it!")
+ return
+ end
+ end
+
if verbose then
if you.see_grid(marker:pos()) then
crawl.mpr( self.disappear or