summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-util.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-02-09 17:07:46 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-02-09 17:07:46 +0000
commitfe3ad5a6e53874ab5e046e3e893c8a45fd63701a (patch)
tree020121f424f859b4883b99dc682a11050932e843 /crawl-ref/source/mon-util.cc
parent2eaaef324ecd00880bb9a097e026b663361f7ce4 (diff)
downloadcrawl-ref-fe3ad5a6e53874ab5e046e3e893c8a45fd63701a.tar.gz
crawl-ref-fe3ad5a6e53874ab5e046e3e893c8a45fd63701a.zip
Fix 1889917: Respect mon_glyph option also for randomly coloured
monsters, most notably gila monsters and killer klowns. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3415 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mon-util.cc')
-rw-r--r--crawl-ref/source/mon-util.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index f941730d8c..ba07ef0b95 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -1388,10 +1388,16 @@ void define_monster(monsters &mons)
case MONS_BUTTERFLY:
case MONS_SPATIAL_VORTEX:
case MONS_KILLER_KLOWN:
+ if (col != BLACK) // maybe overwritten by the mon_glyph option
+ break;
+
col = random_colour();
break;
case MONS_GILA_MONSTER:
+ if (col != BLACK) // maybe overwritten by the mon_glyph option
+ break;
+
temp_rand = random2(7);
col = (temp_rand >= 5 ? LIGHTRED : // 2/7