diff options
| author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-24 01:41:54 +0000 |
|---|---|---|
| committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-24 01:41:54 +0000 |
| commit | 4bc8fa481841a89bd2b6880f7570824478048ca1 (patch) | |
| tree | d939a75f96f3ae730f7f79ff226d6028d3045007 /crawl-ref/source/initfile.cc | |
| parent | 04fbe88386b9ebe9d655b0270c9453a885b05d1c (diff) | |
| download | crawl-ref-4bc8fa481841a89bd2b6880f7570824478048ca1.tar.gz crawl-ref-4bc8fa481841a89bd2b6880f7570824478048ca1.zip | |
Moving more settings to the Tiles options file. Fixing a mouse-related crash that Johanna mentioned.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6657 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.cc')
| -rw-r--r-- | crawl-ref/source/initfile.cc | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 0b1594d947..55e6e64aac 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -863,10 +863,13 @@ void game_options::reset_options() tile_font_tip_size = 15; tile_font_lbl_file = "Vera.ttf"; tile_font_lbl_size = 14; -#endif -#ifdef WIN32TILES - use_dos_char = true; + // window layout + tile_full_screen = false; + tile_window_width = 1024; + tile_window_height = 768; + tile_map_pixels = 4; + tile_tooltip_ms = 1000; #endif // map each colour to itself as default @@ -2980,10 +2983,11 @@ void game_options::read_option_line(const std::string &str, bool runscript) tile_font_lbl_file = field; } else INT_OPTION(tile_font_lbl_size, 1, INT_MAX); -#endif - -#ifdef WIN32TILES - else BOOL_OPTION(use_dos_char); + else BOOL_OPTION(tile_full_screen); + else INT_OPTION(tile_window_width, 1, INT_MAX); + 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); #endif else if(key == "bindkey") |