summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/misc.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/misc.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/misc.cc')
-rw-r--r--crawl-ref/source/misc.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 545529aa48..50107ebd2f 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -18,7 +18,7 @@
#include "notes.h"
#include <string.h>
-#if !defined(__IBMCPP__)
+#if !defined(__IBMCPP__) && !defined(_MSC_VER)
#include <unistd.h>
#endif
@@ -1840,7 +1840,7 @@ void monster_threat_values(double *general, double *highest)
if (monster->alive() && mons_near(monster) && !mons_friendly(monster))
{
const int xp = exper_value(monster);
- const double log_xp = log(xp);
+ const double log_xp = log((double)xp);
sum += log_xp;
if (xp > highest_xp)
{
@@ -1855,7 +1855,7 @@ void monster_threat_values(double *general, double *highest)
bool player_in_a_dangerous_place()
{
- const double logexp = log(you.experience);
+ const double logexp = log((double)you.experience);
double gen_threat = 0.0, hi_threat = 0.0;
monster_threat_values(&gen_threat, &hi_threat);