diff options
author | pauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-10 03:30:55 +0000 |
---|---|---|
committer | pauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-10 03:30:55 +0000 |
commit | 77b5cadac636ddee4ed39bcaf1344c270fcaa447 (patch) | |
tree | 909c1ce1e1fa67eb83548c97790da2287c4d01e1 /crawl-ref/source/acr.cc | |
parent | de978e5fed84aaa1b077fed70b93eba1a3d82edc (diff) | |
download | crawl-ref-77b5cadac636ddee4ed39bcaf1344c270fcaa447.tar.gz crawl-ref-77b5cadac636ddee4ed39bcaf1344c270fcaa447.zip |
Batch of tiny changes for MSVC compiles.
Most of these fall into the category:
- don't use struct to refer to a class, and vice versa
- msvc doesn't like unistd.h or dirent.h
Doesn't fix all the struct/class problems; I think I'll silence
those for now and move on because it's not all that important.
Tested on OS X.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3571 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/acr.cc')
-rw-r--r-- | crawl-ref/source/acr.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 1e3a6c7bff..8a1942265a 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -3183,7 +3183,7 @@ static command_type get_next_cmd() // Clamp idle time so that play time is more meaningful. if (after - before > IDLE_TIME_CLAMP) { - you.real_time += (before - you.start_time) + IDLE_TIME_CLAMP; + you.real_time += int(before - you.start_time) + IDLE_TIME_CLAMP; you.start_time = after; } @@ -3925,7 +3925,7 @@ static void move_player(int move_x, int move_y) if (targ_monst != NON_MONSTER && !mons_is_submerged(&menv[targ_monst])) { - struct monsters *mon = &menv[targ_monst]; + monsters *mon = &menv[targ_monst]; if (can_swap_places && !beholder) { |