From 4551b276a164f4fb98a230b35f771afbe76f1710 Mon Sep 17 00:00:00 2001 From: terminx Date: Mon, 23 Apr 2018 06:34:33 +0000 Subject: [PATCH] MSVC warning fix git-svn-id: https://svn.eduke32.com/eduke32@6840 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/build/include/compat.h | 3 +++ source/duke3d/src/game.cpp | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source/build/include/compat.h b/source/build/include/compat.h index 4a2c9f489..6e6a020b1 100644 --- a/source/build/include/compat.h +++ b/source/build/include/compat.h @@ -7,6 +7,9 @@ #pragma once +#ifdef _WIN32 +# include "windows_inc.h" +#endif ////////// Compiler detection ////////// diff --git a/source/duke3d/src/game.cpp b/source/duke3d/src/game.cpp index 97ef2bd4e..d8ff0cb74 100644 --- a/source/duke3d/src/game.cpp +++ b/source/duke3d/src/game.cpp @@ -62,7 +62,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #endif #ifdef _WIN32 -# define WIN32_LEAN_AND_MEAN 1 # include # define UPDATEINTERVAL 604800 // 1w # include "winbits.h" @@ -6593,7 +6592,7 @@ int app_main(int argc, char const * const * argv) minitext_lowercase = 1; for (bssize_t i = MINIFONT + ('a'-'!'); minitext_lowercase && i < MINIFONT + ('z'-'!') + 1; ++i) - minitext_lowercase &= tileLoad(i); + minitext_lowercase &= (int)tileLoad(i); if (g_networkMode != NET_DEDICATED_SERVER) {