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/item_use.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/item_use.cc')
| -rw-r--r-- | crawl-ref/source/item_use.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 78f2315915..902565deed 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -42,7 +42,7 @@ #include "debug.h" #include "delay.h" #include "describe.h" -#include "direct.h" +#include "directn.h" #include "effects.h" #include "fight.h" #include "food.h" @@ -3586,10 +3586,10 @@ bool _drink_fountain() 20, 20, 4, 4, 4 }; - COMPILE_CHECK( ARRAYSIZE(weights) == ARRAYSIZE(effects), c1 ); + COMPILE_CHECK( ARRAYSZ(weights) == ARRAYSZ(effects), c1 ); fountain_effect = effects[choose_random_weighted(weights, - weights + ARRAYSIZE(weights))]; + weights + ARRAYSZ(weights))]; } if (fountain_effect != POT_WATER && fountain_effect != POT_BLOOD) |