Describe closed shops as "abandoned" and colour its glyph grey (= lights

turned off).


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

3 files changed, 21 insertions, 8 deletions

diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index 16725bf3ed..a2f96ef24a 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -2603,8 +2603,15 @@ std::string feature_description(const coord_def& where, bool bloody,
         return (feature_description(grid, get_trap_type(where), bloody,
                                     dtype, add_stop));
     case DNGN_ENTER_SHOP:
-        return (shop_name(where, add_stop));
-
+    {
+        std::string desc = "";
+        if (shop_is_closed(where))
+        {
+            desc = "An abandoned shop";
+            return thing_do_grammar(dtype, add_stop, false, desc);
+        }
+        return shop_name(where, add_stop);
+    }
     case DNGN_ENTER_PORTAL_VAULT:
         return (thing_do_grammar(
                     dtype, add_stop, false,
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 58bca496ba..a2f099a45d 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -3065,13 +3065,17 @@ bool is_dragonkind(const actor *act, const monsters *mon)
         return (true);
     }
 
-    if (act->atype() == ACT_PLAYER
-        && you.attribute[ATTR_TRANSFORMATION] == TRAN_DRAGON)
+    if (act->atype() == ACT_PLAYER)
     {
-        return (true);
+        return (you.attribute[ATTR_TRANSFORMATION] == TRAN_DRAGON
+                || you.attribute[ATTR_TRANSFORMATION] == TRAN_SERPENT_OF_HELL);
     }
-    else if (act->atype() == ACT_MONSTER
-        && mons_is_zombified(mon)
+    // else the actor is a monster
+
+    if (mon->type == MONS_SERPENT_OF_HELL)
+        return (true);
+
+    if (mons_is_zombified(mon)
         && (mons_genus(mon->base_monster) == MONS_DRAGON
             || mons_genus(mon->base_monster) == MONS_DRACONIAN))
     {
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index 6ec000adf0..40cde6e390 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -466,7 +466,9 @@ static void _get_symbol( const coord_def& where,
             {
                 // Don't clobber with BLACK, because the colour should be
                 // already set.
-                if (fdef.colour != BLACK)
+                if (shop_is_closed(where))
+                    *colour = LIGHTGREY | colmask;
+                else if (fdef.colour != BLACK)
                     *colour = fdef.colour | colmask;
 
                 if (fdef.em_colour != fdef.colour && fdef.em_colour)