diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-19 23:13:26 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-19 23:13:26 +0000 |
| commit | 9ba57ee3a6f72308ff01263dfe143cf23c1cf321 (patch) | |
| tree | 968cb123684f700f4a612804f8670b0e8e049a93 /crawl-ref/source/initfile.cc | |
| parent | 003c3dc779fbd0ba44bc4fafadafb45db537fda7 (diff) | |
| download | crawl-ref-9ba57ee3a6f72308ff01263dfe143cf23c1cf321.tar.gz crawl-ref-9ba57ee3a6f72308ff01263dfe143cf23c1cf321.zip | |
Fixes to compile with Visual C++. Moved direct.cc and direct.h to directn.* to avoid conflict with VC++ direct.h header.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4390 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.cc')
| -rw-r--r-- | crawl-ref/source/initfile.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 8ce4243eca..f822989c55 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -25,7 +25,7 @@ #include "chardump.h" #include "clua.h" #include "delay.h" -#include "direct.h" +#include "directn.h" #include "Kills.h" #include "files.h" #include "defines.h" @@ -143,7 +143,7 @@ int str_to_colour( const std::string &str, int default_colour, "iron", "bone", "random" }; - ASSERT(ARRAYSIZE(element_cols) == (EC_RANDOM - EC_FIRE) + 1); + ASSERT(ARRAYSZ(element_cols) == (EC_RANDOM - EC_FIRE) + 1); for (ret = 0; ret < 16; ret++) { @@ -2411,8 +2411,9 @@ void game_options::read_option_line(const std::string &str, bool runscript) } else BOOL_OPTION(explore_greedy); else BOOL_OPTION(explore_improved); - else BOOL_OPTION(trap_prompt); - else if (key == "stash_tracking") + + BOOL_OPTION(trap_prompt); + else if (key == "stash_tracking") { stash_tracking = field == "dropped" ? STM_DROPPED : @@ -3102,7 +3103,7 @@ void menu_sort_condition::set_menu_type(std::string &s) { "pickup:", MT_PICKUP } }; - for (unsigned mi = 0; mi < ARRAYSIZE(menu_type_map); ++mi) + for (unsigned mi = 0; mi < ARRAYSZ(menu_type_map); ++mi) { const std::string &name = menu_type_map[mi].mname; if (s.find(name) == 0) |