diff options
author | pauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-10 06:31:01 +0000 |
---|---|---|
committer | pauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-10 06:31:01 +0000 |
commit | 8a737d409cea505589f5b67fab49f138265a8174 (patch) | |
tree | df38e20bb1eed6abd6c3603094e109aec11fa96e /crawl-ref/source/initfile.cc | |
parent | 70b1954c4daae8ee3f364481d0bc245a81720513 (diff) | |
download | crawl-ref-8a737d409cea505589f5b67fab49f138265a8174.tar.gz crawl-ref-8a737d409cea505589f5b67fab49f138265a8174.zip |
Another batch of msvc compile fixes.
Added wrapper implementation for opendir/readdir
Other functions left stubbed out.
It's a shame that crawl's "direct.h" conflicts with <direct.h>.
Fixed up use of AppHdr.h in a couple places (it must be included first);
changed project to use precompiled headers.
crawl now compiles cleanly but doesn't link.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3573 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.cc')
-rw-r--r-- | crawl-ref/source/initfile.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 805d9d4312..785acb35af 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -2543,7 +2543,8 @@ void game_options::read_option_line(const std::string &str, bool runscript) } } } - else if (key == "menu_colour" || key == "menu_color") + // MSVC has a limit on how many if/else if can be chained together. + /* else */ if (key == "menu_colour" || key == "menu_color") { std::vector<std::string> seg = split_string(",", field); for (int i = 0, count = seg.size(); i < count; ++i) |