summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/initfile.cc
diff options
context:
space:
mode:
authorennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2008-01-05 01:33:53 +0000
committerennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2008-01-05 01:33:53 +0000
commit62f7040f14b39e67042be98f951575fbc819e84e (patch)
treed4fa0598a1bee1d34fff81e2c150de08c2256753 /crawl-ref/source/initfile.cc
parent19155f1f85058ef9d65d11e60c63cc69c36d4e8a (diff)
downloadcrawl-ref-62f7040f14b39e67042be98f951575fbc819e84e.tar.gz
crawl-ref-62f7040f14b39e67042be98f951575fbc819e84e.zip
Tiles!
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3194 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.cc')
-rw-r--r--crawl-ref/source/initfile.cc29
1 files changed, 29 insertions, 0 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index d17dcd6df1..d2b5421992 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -654,7 +654,11 @@ void game_options::reset_options()
detected_item_colour = GREEN;
detected_monster_colour= LIGHTRED;
+#ifdef USE_TILE
+ classic_item_colours = true;
+#else
classic_item_colours = false;
+#endif
easy_exit_menu = true;
#ifdef DOS
@@ -742,6 +746,14 @@ void game_options::reset_options()
wiz_mode = WIZ_NO;
#endif
+#ifdef USE_TILE
+ show_items[0] = '0';
+#endif
+
+#ifdef WIN32TILES
+ use_dos_char = true;
+#endif
+
// map each colour to itself as default
#ifdef USE_8_COLOUR_TERM_MAP
for (int i = 0; i < 16; i++)
@@ -1613,6 +1625,7 @@ void game_options::read_option_line(const std::string &str, bool runscript)
player_name = field;
}
#endif
+#ifndef USE_TILE
else if (key == "char_set" || key == "ascii_display")
{
bool valid = true;
@@ -1642,6 +1655,7 @@ void game_options::read_option_line(const std::string &str, bool runscript)
}
}
}
+#endif
else if (key == "default_autopickup")
{
// should autopickup default to on or off?
@@ -2602,6 +2616,21 @@ void game_options::read_option_line(const std::string &str, bool runscript)
else
pickup_mode = read_bool_or_number(field, pickup_mode, "auto:");
}
+
+#ifdef USE_TILE
+ else if (key == "show_items" )
+ {
+ strncpy(show_items, field.c_str(), 18);
+ }
+#endif
+
+#ifdef WIN32TILES
+ else if (key == "use_dos_char" )
+ {
+ use_dos_char = read_bool( field, use_dos_char );
+ }
+#endif
+
// Catch-all else, copies option into map
else if (runscript)
{