From 8e8bbf5c5490f939ffdd09649ea745f30e4c9571 Mon Sep 17 00:00:00 2001
From: ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Tue, 1 Jul 2008 03:08:10 +0000
Subject: [2004538] Fixed Vestibule of Hell bugs where entering would place you
 randomly and would not set travel information correctly.  Also, updated
 locations in the code where the old command Ctrl-G was mentioned.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6274 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/files.cc    | 2 +-
 crawl-ref/source/overmap.cc  | 2 +-
 crawl-ref/source/tutorial.cc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'crawl-ref/source')

diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc
index f950698192..0973aa4fa5 100644
--- a/crawl-ref/source/files.cc
+++ b/crawl-ref/source/files.cc
@@ -833,7 +833,7 @@ static void _place_player_on_stair(branch_type old_branch,
     else if (stair_taken == DNGN_ENTER_HELL)
     {
         // The vestibule and labyrinth always start from this stair.
-        stair_taken = DNGN_STONE_STAIRS_UP_I;
+        stair_taken = DNGN_EXIT_HELL;
     }
     else if (stair_taken >= DNGN_STONE_STAIRS_DOWN_I
              && stair_taken <= DNGN_ESCAPE_HATCH_DOWN)
diff --git a/crawl-ref/source/overmap.cc b/crawl-ref/source/overmap.cc
index caa364599a..158590d297 100644
--- a/crawl-ref/source/overmap.cc
+++ b/crawl-ref/source/overmap.cc
@@ -202,7 +202,7 @@ std::string overview_description_string()
             {
                 disp += "\n<green>Branches:</green>";
                 if (crawl_state.need_save || !crawl_state.updating_scores)
-                    disp += " (use <white>Ctrl-G</white> to reach them)";
+                    disp += " (use <white>G</white> to reach them)";
                 disp += EOL;
                 seen_anything = true;
             }
diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc
index 4a7979b991..6251da1299 100644
--- a/crawl-ref/source/tutorial.cc
+++ b/crawl-ref/source/tutorial.cc
@@ -803,9 +803,9 @@ void tutorial_finished()
     else if (Options.tut_travel)
     {
         text =  "There is a convenient way for travelling between far away "
-                "dungeon levels: press <w>Ctrl-G</w> and enter the desired "
+                "dungeon levels: press <w>G</w> and enter the desired "
                 "destination. If your travel gets interrupted, issueing "
-                "<w>Ctrl-G Enter</w> will continue it.";
+                "<w>G Enter</w> will continue it.";
     }
     else if (Options.tut_stashes)
     {
-- 
cgit v1.2.3-54-g00ecf