fix MSVC build

git-svn-id: https://svn.eduke32.com/eduke32@1925 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2011-07-01 12:22:12 +00:00
parent 6a713133cf
commit 4e0da757ef
2 changed files with 5 additions and 5 deletions

View file

@ -938,8 +938,6 @@ static int32_t defsparser(scriptfile *script)
int32_t shadeoffs=0, pal=0, flags=0; int32_t shadeoffs=0, pal=0, flags=0;
uint8_t usedframebitmap[1024>>3]; uint8_t usedframebitmap[1024>>3];
Bmemset(usedframebitmap, 0, sizeof(usedframebitmap));
static const tokenlist modeltokens[] = static const tokenlist modeltokens[] =
{ {
{ "scale", T_SCALE }, { "scale", T_SCALE },
@ -956,6 +954,8 @@ static int32_t defsparser(scriptfile *script)
{ "flags", T_FLAGS }, { "flags", T_FLAGS },
}; };
Bmemset(usedframebitmap, 0, sizeof(usedframebitmap));
modelskin = lastmodelskin = 0; modelskin = lastmodelskin = 0;
seenframe = 0; seenframe = 0;

View file

@ -9740,14 +9740,14 @@ int32_t setgamemode(char davidoption, int32_t daxdim, int32_t daydim, int32_t da
{ {
int32_t i, j; int32_t i, j;
daxdim = max(320, daxdim);
daydim = max(200, daydim);
#ifdef USE_OPENGL #ifdef USE_OPENGL
extern char nogl; extern char nogl;
if (nogl) dabpp = 8; if (nogl) dabpp = 8;
#endif #endif
daxdim = max(320, daxdim);
daydim = max(200, daydim);
if ((qsetmode == 200) && (videomodereset == 0) && if ((qsetmode == 200) && (videomodereset == 0) &&
(davidoption == fullscreen) && (xdim == daxdim) && (ydim == daydim) && (bpp == dabpp) (davidoption == fullscreen) && (xdim == daxdim) && (ydim == daydim) && (bpp == dabpp)
/* /*