From 4e0da757efed4f8f541846c74c820eb68402c13e Mon Sep 17 00:00:00 2001 From: helixhorned Date: Fri, 1 Jul 2011 12:22:12 +0000 Subject: [PATCH] fix MSVC build git-svn-id: https://svn.eduke32.com/eduke32@1925 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/src/defs.c | 4 ++-- polymer/eduke32/build/src/engine.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/polymer/eduke32/build/src/defs.c b/polymer/eduke32/build/src/defs.c index 0674a096b..e0f952c28 100644 --- a/polymer/eduke32/build/src/defs.c +++ b/polymer/eduke32/build/src/defs.c @@ -938,8 +938,6 @@ static int32_t defsparser(scriptfile *script) int32_t shadeoffs=0, pal=0, flags=0; uint8_t usedframebitmap[1024>>3]; - Bmemset(usedframebitmap, 0, sizeof(usedframebitmap)); - static const tokenlist modeltokens[] = { { "scale", T_SCALE }, @@ -956,6 +954,8 @@ static int32_t defsparser(scriptfile *script) { "flags", T_FLAGS }, }; + Bmemset(usedframebitmap, 0, sizeof(usedframebitmap)); + modelskin = lastmodelskin = 0; seenframe = 0; diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c index efcc7e8cc..c8e7da63f 100644 --- a/polymer/eduke32/build/src/engine.c +++ b/polymer/eduke32/build/src/engine.c @@ -9740,14 +9740,14 @@ int32_t setgamemode(char davidoption, int32_t daxdim, int32_t daydim, int32_t da { int32_t i, j; - daxdim = max(320, daxdim); - daydim = max(200, daydim); - #ifdef USE_OPENGL extern char nogl; if (nogl) dabpp = 8; #endif + daxdim = max(320, daxdim); + daydim = max(200, daydim); + if ((qsetmode == 200) && (videomodereset == 0) && (davidoption == fullscreen) && (xdim == daxdim) && (ydim == daydim) && (bpp == dabpp) /*