summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/initfile.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-06-21 21:25:58 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-06-21 21:25:58 +0000
commit53b94b89c7037837eb6bf00ea8b71d9f92963f35 (patch)
treebde5ccd8d4071e4aa3b87d1b5c26bdd903e59f1a /crawl-ref/source/initfile.cc
parent43b1796995f29d920d306860969c751e4bb26640 (diff)
downloadcrawl-ref-53b94b89c7037837eb6bf00ea8b71d9f92963f35.tar.gz
crawl-ref-53b94b89c7037837eb6bf00ea8b71d9f92963f35.zip
Apply commits r10013 and 10014 to trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10015 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.cc')
-rw-r--r--crawl-ref/source/initfile.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 6b47f77579..b4591ef163 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -935,11 +935,12 @@ void game_options::reset_options()
tile_window_width = 0;
tile_window_height = 0;
tile_map_pixels = 0;
- tile_tag_pref = crawl_state.arena ? TAGPREF_NAMED : TAGPREF_ENEMY;
// delays
+ tile_update_rate = 1000;
tile_key_repeat_delay = 200;
tile_tooltip_ms = 500;
+ tile_tag_pref = crawl_state.arena ? TAGPREF_NAMED : TAGPREF_ENEMY;
#endif
// map each colour to itself as default
@@ -3161,6 +3162,7 @@ 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 INT_OPTION(tile_update_rate, 50, INT_MAX);
else if (key == "tile_tag_pref")
{
tile_tag_pref = string2tag_pref(field.c_str());