Since there's currently only one type of portal vault (labyrinths are

treated differently) change the gate description to "gateway to a
bazaar", so the bazaar description can actually be searched for.
Eventually we might like to include Labyrinths, portal vaults, the
Abyss and Pandemonium in the branch descriptions.


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

3 files changed, 19 insertions, 10 deletions

diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 30651524f8..b9c51b7449 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -41,6 +41,7 @@
 #include "mon-pick.h"
 #include "mon-util.h"
 #include "ouch.h"
+#include "place.h"
 #include "player.h"
 #include "quiver.h"
 #include "religion.h"
@@ -1020,8 +1021,16 @@ static std::vector<std::string> _get_branch_keys()
 
         names.push_back(branch.shortname);
     }
-
-    return names;
+/*
+    // Maybe include other level areas, as well.
+    for (int i = LEVEL_LABYRINTH; i < NUM_LEVEL_AREA_TYPES; i++)
+    {
+        names.push_back(place_name(
+                            get_packed_place(BRANCH_MAIN_DUNGEON, 1,
+                                static_cast<level_area_type>(i)), true));
+    }
+*/
+    return (names);
 }
 
 static bool _monster_filter(std::string key, std::string body)
@@ -1750,8 +1759,8 @@ static void _add_formatted_keyhelp(column_composer &cols)
         "<lightcyan>";
 
     get_item_symbol(DNGN_ITEM_BOOK, &ch, &colour);
-    item_types += static_cast<char>(ch); 
-    item_types += 
+    item_types += static_cast<char>(ch);
+    item_types +=
         "</lightcyan> : books (<w>r</w>ead, <w>M</w>emorise and <w>z</w>ap)\n"
         "<brown>\\</brown> : staves and rods (<w>w</w>ield and e<w>v</w>oke)\n"
         "<lightgreen>}</lightgreen> : miscellaneous items (e<w>v</w>oke)\n"
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 8d3b268e00..e85c5a4163 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -2016,7 +2016,8 @@ std::string raw_feature_description(dungeon_feature_type grid,
     case DNGN_ENTER_SHOALS:
         return ("staircase to the Shoals");
     case DNGN_ENTER_PORTAL_VAULT:
-        return ("gate leading to a distant place");
+//        return ("gate leading to a distant place");
+        return ("gateway to a bazaar");
     case DNGN_EXIT_PORTAL_VAULT:
         return ("gate leading back to the Dungeon");
     case DNGN_RETURN_FROM_ORCISH_MINES:
diff --git a/crawl-ref/source/place.cc b/crawl-ref/source/place.cc
index efaf31ede9..6815095732 100644
--- a/crawl-ref/source/place.cc
+++ b/crawl-ref/source/place.cc
@@ -65,9 +65,8 @@ unsigned short get_packed_place()
 
 bool single_level_branch( branch_type branch )
 {
-    return
-        branch >= 0 && branch < NUM_BRANCHES
-        && branches[branch].depth == 1;
+    return (branch >= 0 && branch < NUM_BRANCHES
+            && branches[branch].depth == 1);
 }
 
 std::string place_name( unsigned short place, bool long_name,
@@ -103,10 +102,10 @@ std::string place_name( unsigned short place, bool long_name,
     result = (long_name ?
               branches[branch].longname : branches[branch].abbrevname);
 
-    if ( include_number && branches[branch].depth != 1 )
+    if (include_number && branches[branch].depth != 1)
     {
         char buf[200];
-        if ( long_name )
+        if (long_name)
         {
             // decapitalize 'the'
             if ( result.find("The") == 0 )