summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-util.cc
diff options
context:
space:
mode:
authorDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-01 11:50:21 -0600
committerDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-01 11:51:07 -0600
commitfde948014517c0486207e6b369e777502f2e5511 (patch)
tree9bc5586a4b158cc316692f337b9f25cb76bc586a /crawl-ref/source/mon-util.cc
parent1fb4a8139f535478e97e7b2fda9c81208b586804 (diff)
downloadcrawl-ref-fde948014517c0486207e6b369e777502f2e5511.tar.gz
crawl-ref-fde948014517c0486207e6b369e777502f2e5511.zip
Add various color-related fixes.
Diffstat (limited to 'crawl-ref/source/mon-util.cc')
-rw-r--r--crawl-ref/source/mon-util.cc15
1 files changed, 4 insertions, 11 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 630c80823a..1b1db5653d 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -1566,25 +1566,18 @@ void define_monster(monsters &mons)
(coinflip() ? MST_DEEP_ELF_CONJURER_I : MST_DEEP_ELF_CONJURER_II);
break;
- case MONS_BUTTERFLY:
- case MONS_SPATIAL_VORTEX:
- case MONS_KILLER_KLOWN:
+ case MONS_GILA_MONSTER:
if (col != BLACK) // May be overwritten by the mon_glyph option.
break;
- col = random_colour();
+ col = element_colour(ETC_GILA);
break;
- case MONS_GILA_MONSTER:
+ case MONS_KRAKEN:
if (col != BLACK) // May be overwritten by the mon_glyph option.
break;
- temp_rand = random2(7);
-
- col = (temp_rand >= 5 ? LIGHTRED : // 2/7
- temp_rand >= 3 ? LIGHTMAGENTA : // 2/7
- temp_rand >= 1 ? MAGENTA // 1/7
- : YELLOW); // 1/7
+ col = element_colour(ETC_KRAKEN);
break;
case MONS_DRACONIAN_CALLER: