diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-07 11:53:26 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-07 11:53:26 +0000 |
commit | 522955930be026a79588e83952e7abca19e20e73 (patch) | |
tree | e49fd857e4799c3ff0776ddf341610d3c60027d9 /crawl-ref/source/mapdef.cc | |
parent | 10aeabaacb1c2cdc6b6227328df34287b7f75d4f (diff) | |
download | crawl-ref-522955930be026a79588e83952e7abca19e20e73.tar.gz crawl-ref-522955930be026a79588e83952e7abca19e20e73.zip |
Allow overriding monster colours in map specs using col:<newcolour>.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2353 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mapdef.cc')
-rw-r--r-- | crawl-ref/source/mapdef.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc index 8dadc81c8f..c446f6d969 100644 --- a/crawl-ref/source/mapdef.cc +++ b/crawl-ref/source/mapdef.cc @@ -1907,6 +1907,18 @@ mons_list::mons_spec_slot mons_list::parse_mons_spec(std::string spec) mspec.fix_mons = strip_tag(s, "fix_mons"); mspec.generate_awake = strip_tag(s, "generate_awake"); + std::string colour = strip_tag_prefix(s, "col:"); + if (!colour.empty()) + { + mspec.colour = str_to_colour(colour, BLACK); + if (mspec.colour == BLACK) + { + error = make_stringf("bad monster colour \"%s\" in \"%s\"", + colour.c_str(), specs[i].c_str()); + return (slot); + } + } + trim_string(s); if (s == "8") |