summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/command.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-09-17 21:04:04 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-09-17 21:04:04 +0000
commitd636d3368b6441379025477373212cd203fe16bf (patch)
treee21710f2ca920d456247f29ecfe7a49bbe10e160 /crawl-ref/source/command.cc
parent04a7ba1ee47556dcdf4d7ce56ebb7596f66cebfb (diff)
downloadcrawl-ref-d636d3368b6441379025477373212cd203fe16bf.tar.gz
crawl-ref-d636d3368b6441379025477373212cd203fe16bf.zip
Simplify further.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10700 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/command.cc')
-rw-r--r--crawl-ref/source/command.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index df0d87914d..f3f52191ad 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -1340,11 +1340,10 @@ static bool _do_description(std::string key, std::string type,
else
{
monster_type mon_num = get_monster_by_name(key, true);
- // Don't attempt to get more information on ghosts or
- // pandemonium demons, as the ghost struct has not been
- // initialised, which will cause a crash.
- if (mon_num != MONS_PROGRAM_BUG && mon_num != MONS_PLAYER_GHOST
- && mon_num != MONS_PANDEMONIUM_DEMON)
+ // Don't attempt to get more information on ghost demon
+ // monsters, as the ghost struct has not been initialised, which
+ // will cause a crash.
+ if (mon_num != MONS_PROGRAM_BUG && !mons_is_ghost_demon(mon_num))
{
monsters mon;
mon.type = mon_num;