Rename "Portal Chamber" to "Bazaar".

Fix not stepping into deep water taking a turn.
Fix reading an unID'ed ?torment being regarded as unholy.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2754 c06c8d41-db1a-0410-9941-cceddc491573

4 files changed, 12 insertions, 3 deletions

diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index a028d98df0..18eeb1a398 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -3302,7 +3302,8 @@ static void move_player(int move_x, int move_y)
     {
         you.time_taken *= player_movement_speed();
         you.time_taken /= 10;
-        move_player_to_grid(targ_x, targ_y, true, false, swap);
+        if (!move_player_to_grid(targ_x, targ_y, true, false, swap))
+            return;
 
         move_x = 0;
         move_y = 0;
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index b3985a3c3b..4821fdc405 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -3706,7 +3706,7 @@ void read_scroll(void)
         torment( TORMENT_SCROLL, you.x_pos, you.y_pos );
 
         // is only naughty if you know you're doing it
-        if (!item_type_known(scroll))
+        if (item_type_known(scroll))
             did_god_conduct(DID_UNHOLY, 10);
         break;
 
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 4e9c911c61..b91504bda5 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -1062,7 +1062,12 @@ std::string level_description_string()
         return "- a Labyrinth";
 
     if (you.level_type == LEVEL_PORTAL_VAULT)
-        return "- a Portal Chamber";
+    {
+         if (you.level_type_name == "bazaar")
+             return "- a Bazaar";
+             
+         return "- a Portal Chamber";
+    }
 
     // level_type == LEVEL_DUNGEON
     char buf[200];
diff --git a/crawl-ref/source/place.cc b/crawl-ref/source/place.cc
index 67de365065..023bcd9534 100644
--- a/crawl-ref/source/place.cc
+++ b/crawl-ref/source/place.cc
@@ -80,6 +80,9 @@ std::string place_name( unsigned short place, bool long_name,
         case LEVEL_LABYRINTH:
             return ( long_name ? "a Labyrinth" : "Lab" );
         case LEVEL_PORTAL_VAULT:
+            if ( you.level_type_name == "bazaar" )
+                return ( long_name ? "a Bazaar" : "Bazaar" );
+
             return ( long_name ? "a Portal Chamber" : "Port" );
         default:
             return ( long_name ? "Buggy Badlands" : "Bug" );