The "Place:" for ziggurats now displays as "Ziggurat:1"/"Ziggurat:2"/etc

instead of "A Ziggurat".

Notes now remember which type of portal you entered:
   153 | Portal  | Entered level 1 of a ziggurat.
   168 | Portal  | Entered level 2 of a ziggurat.
   189 | Bazaar  | Entered a bazaar.


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

1 files changed, 9 insertions, 1 deletions

diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 39b0fb8c9e..b6b5d4795f 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -900,7 +900,15 @@ static std::string _level_description_string_hud()
              || place.level_type == LEVEL_LABYRINTH)
     {
         if (!you.level_type_name.empty())
-            short_name = article_a(upcase_first(you.level_type_name), false);
+        {
+            // If the level name is faking a dungeon depth
+            // (i.e., "Ziggurat:3") then don't add an article
+            if (you.level_type_name.find(":") != std::string::npos)
+                short_name = you.level_type_name;
+            else
+                short_name = article_a(upcase_first(you.level_type_name),
+                                       false);
+        }
         else
             short_name.insert(0, "A ");
     }