summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/misc.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-12-07 21:25:14 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-12-07 21:25:14 +0000
commit7b19365a5c3941c09fa776bf3e9b221bf0b48ae6 (patch)
tree52054f94d2d6ae75a26fa8464f1e8444149fc075 /crawl-ref/source/misc.cc
parentb43c29a0451184b817fb46f73989df0c9ae9407d (diff)
downloadcrawl-ref-7b19365a5c3941c09fa776bf3e9b221bf0b48ae6.tar.gz
crawl-ref-7b19365a5c3941c09fa776bf3e9b221bf0b48ae6.zip
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
Diffstat (limited to 'crawl-ref/source/misc.cc')
-rw-r--r--crawl-ref/source/misc.cc14
1 files changed, 9 insertions, 5 deletions
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))
{