summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/dungeon.cc2
-rw-r--r--crawl-ref/source/mapdef.cc2
-rw-r--r--crawl-ref/source/wiz-mon.cc3
3 files changed, 2 insertions, 5 deletions
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index 381eb18982..6eab3cad24 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -4854,7 +4854,7 @@ int dgn_place_monster(mons_spec &mspec,
mg.mname = mspec.monname;
// XXX: hack.
- if (mg.colour == BLACK)
+ if (mg.colour == -1)
mg.colour = random_colour();
coord_def place(where);
diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc
index c295cc5394..bfa32eed3b 100644
--- a/crawl-ref/source/mapdef.cc
+++ b/crawl-ref/source/mapdef.cc
@@ -2578,7 +2578,7 @@ mons_list::mons_spec_slot mons_list::parse_mons_spec(std::string spec)
{
if (colour == "any")
// XXX: Hack
- mspec.colour = BLACK;
+ mspec.colour = -1;
else
{
mspec.colour = str_to_colour(colour, BLACK);
diff --git a/crawl-ref/source/wiz-mon.cc b/crawl-ref/source/wiz-mon.cc
index f25d064095..3701d344a0 100644
--- a/crawl-ref/source/wiz-mon.cc
+++ b/crawl-ref/source/wiz-mon.cc
@@ -97,9 +97,6 @@ void wizard_create_spec_monster_name()
return;
}
- if (mspec.colour == BLACK && strstr(specs, "col:any") == NULL)
- mspec.colour = mons_class_colour(mspec.mid);
-
int type = mspec.mid;
if (mons_class_is_zombified(mspec.mid))
type = mspec.monbase;