summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/initfile.cc
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2014-04-14 02:58:45 -0400
committerNeil Moore <neil@s-z.org>2014-04-14 03:18:12 -0400
commit248eb57cf377b191ebf77f812cc1866aaa404235 (patch)
treeb13c771dce077df6f2935b3d333a173b600ddcc0 /crawl-ref/source/initfile.cc
parentc0ff181526c360bfdb38f025a4ebc5dbdac1aec2 (diff)
downloadcrawl-ref-248eb57cf377b191ebf77f812cc1866aaa404235.tar.gz
crawl-ref-248eb57cf377b191ebf77f812cc1866aaa404235.zip
Fix NOWIZARD compilation (#8369).
The CLua console and --no-save were partially but not completely contained in #ifdef WIZARD. Make them both work without WIZARD.
Diffstat (limited to 'crawl-ref/source/initfile.cc')
-rw-r--r--crawl-ref/source/initfile.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 83e25dbe8b..7db2a01b2a 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -972,9 +972,9 @@ void game_options::reset_options()
#else
wiz_mode = WIZ_NO;
#endif
+#endif
terp_files.clear();
no_save = false;
-#endif
#ifdef USE_TILE
tile_show_items = "!?/%=([)x}:|\\";
@@ -2494,9 +2494,7 @@ void game_options::read_option_line(const string &str, bool runscript)
}
else if (key == "terp_file" && runscript)
{
-#ifdef WIZARD
terp_files.push_back(field);
-#endif
}
else if (key == "colour" || key == "color")
{
@@ -4700,10 +4698,8 @@ bool parse_args(int argc, char **argv, bool rc_only)
break;
case CLO_NO_SAVE:
-#ifdef WIZARD
if (!rc_only)
Options.no_save = true;
-#endif
break;
#ifdef USE_TILE_WEB