Move the prompt on entering a level that is marked as dangerous via

annotation or exclusion *before* the delay is started, so it doesn't
cost a turn.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6087 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 10 insertions, 2 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 3b59ced864..4f3b1521c8 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -1667,7 +1667,7 @@ static void _go_upstairs()
 
     if (ygrd == DNGN_ENTER_SHOP)
     {
-        if ( you.duration[DUR_BERSERKER] )
+        if (you.duration[DUR_BERSERKER])
             canned_msg(MSG_TOO_BERSERK);
         else
             shop();
@@ -1678,10 +1678,14 @@ static void _go_upstairs()
         if (ygrd == DNGN_STONE_ARCH)
             mpr("There is nothing on the other side of the stone arch.");
         else
-            mpr( "You can't go up here!" );
+            mpr("You can't go up here!");
         return;
     }
 
+    // Does the next level have a warning annotation?
+    if (!check_annotation_exclusion_warning())
+        return;
+
     tag_followers();  // only those beside us right now can follow
     start_delay( DELAY_ASCENDING_STAIRS,
                  1 + (you.burden_state > BS_UNENCUMBERED) );
@@ -1718,6 +1722,10 @@ static void _go_downstairs()
         return;
     }
 
+    // Does the next level have a warning annotation?
+    if (!check_annotation_exclusion_warning())
+        return;
+
     if (shaft)
     {
         start_delay( DELAY_DESCENDING_STAIRS, 0, you.your_level );