summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/initfile.cc
diff options
context:
space:
mode:
authorennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-10 16:23:13 +0000
committerennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-10 16:23:13 +0000
commitabec3e39f39b3f598c90b645a45bb43097b8e5cb (patch)
tree6050a955d8385bd0c2d46d12776702c62d585b4e /crawl-ref/source/initfile.cc
parent87616cef0d3617cd349edb6641d32d71cdd96b22 (diff)
downloadcrawl-ref-abec3e39f39b3f598c90b645a45bb43097b8e5cb.tar.gz
crawl-ref-abec3e39f39b3f598c90b645a45bb43097b8e5cb.zip
[2495836] Show names for friendly uniques during arena mode. Also, add a tile_tag_pref option.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8383 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.cc')
-rw-r--r--crawl-ref/source/initfile.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 3bf7c2f180..0d63416dbe 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -73,7 +73,7 @@ god_type str_to_god(std::string god)
}
#ifdef USE_TILE
-const std::string tile_cols[24] =
+static std::string tile_cols[24] =
{
"black", "darkgrey", "grey", "lightgrey", "white",
"blue", "lightblue", "darkblue",
@@ -879,6 +879,7 @@ void game_options::reset_options()
tile_window_height = 0;
tile_map_pixels = 0;
tile_tooltip_ms = 1000;
+ tile_tag_pref = crawl_state.arena ? TAGPREF_NAMED : TAGPREF_ENEMY;
#endif
// map each colour to itself as default
@@ -3064,6 +3065,10 @@ void game_options::read_option_line(const std::string &str, bool runscript)
else INT_OPTION(tile_window_height, 1, INT_MAX);
else INT_OPTION(tile_map_pixels, 1, INT_MAX);
else INT_OPTION(tile_tooltip_ms, 0, INT_MAX);
+ else if (key == "tile_tag_pref")
+ {
+ tile_tag_pref = string2tag_pref(field.c_str());
+ }
#endif
else if(key == "bindkey")