summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/libutil.cc
diff options
context:
space:
mode:
authorpauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-10 06:31:01 +0000
committerpauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-10 06:31:01 +0000
commit8a737d409cea505589f5b67fab49f138265a8174 (patch)
treedf38e20bb1eed6abd6c3603094e109aec11fa96e /crawl-ref/source/libutil.cc
parent70b1954c4daae8ee3f364481d0bc245a81720513 (diff)
downloadcrawl-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/libutil.cc')
-rw-r--r--crawl-ref/source/libutil.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/libutil.cc b/crawl-ref/source/libutil.cc
index c5751a27eb..52fa9094d1 100644
--- a/crawl-ref/source/libutil.cc
+++ b/crawl-ref/source/libutil.cc
@@ -395,7 +395,7 @@ std::string number_in_words(unsigned num, int pow)
return number_in_words(num, 0) + pow_in_words(pow);
unsigned thousands = num % 1000, rest = num / 1000;
- if (!rest and !thousands)
+ if (!rest && !thousands)
return ("zero");
return join_strings((rest? number_in_words(rest, pow + 3) : ""),