summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/initfile.cc
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-16 02:00:13 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-16 02:00:13 +0000
commitb7fba6b11f0b5727ed4dd54324b94f2443ea81e0 (patch)
tree2db275fb964219a84c8701781932e2c71cee43ce /crawl-ref/source/initfile.cc
parentc5f460f024c071a1c56980dc89ab15b2cf860f8c (diff)
downloadcrawl-ref-b7fba6b11f0b5727ed4dd54324b94f2443ea81e0.tar.gz
crawl-ref-b7fba6b11f0b5727ed4dd54324b94f2443ea81e0.zip
Add game option evil_colour, set from the options file variable $evil, and use
it to colour monster pane entries for when it would be unchivarlic for a TSO-ite to attack them. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8468 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.cc')
-rw-r--r--crawl-ref/source/initfile.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index e689f6c8df..648f246052 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -1505,6 +1505,8 @@ void game_options::read_options(InitLineInput &il, bool runscript,
#endif
Options.explore_stop |= Options.explore_stop_prompt;
+
+ evil_colour = str_to_colour(variables["evil"]);
}
void game_options::fixup_options()
@@ -1518,6 +1520,9 @@ void game_options::fixup_options()
if (!check_dir("Morgue directory", morgue_dir))
end(1);
+
+ if (evil_colour == BLACK)
+ evil_colour = MAGENTA;
}
static int _str_to_killcategory(const std::string &s)