Fix a couple of warnings when building with SDL 1.3

git-svn-id: https://svn.eduke32.com/eduke32@1829 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2011-03-05 07:17:00 +00:00
parent 60d47cb805
commit 8dde3b2548

View file

@ -795,11 +795,12 @@ void getvalidmodes(void)
0 0
}; };
SDL_Rect **modes; SDL_Rect **modes;
#if (SDL_MAJOR_VERSION > 1 || SDL_MINOR_VERSION > 2) SDL_PixelFormat pf;
SDL_PixelFormat pf = { NULL, 8, 1, 0,0,0,0, 0,0,0,0, 0,0,0,0 };
#else pf.palette = NULL;
SDL_PixelFormat pf = { NULL, 8, 1, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0 }; pf.BitsPerPixel = 8;
#endif pf.BytesPerPixel = 1;
int32_t i, j, maxx=0, maxy=0; int32_t i, j, maxx=0, maxy=0;
if (modeschecked || novideo) return; if (modeschecked || novideo) return;
@ -834,9 +835,9 @@ void getvalidmodes(void)
pf.BytesPerPixel = cdepths[j] >> 3; pf.BytesPerPixel = cdepths[j] >> 3;
modes = SDL_ListModes(&pf, SURFACE_FLAGS modes = SDL_ListModes(&pf, SURFACE_FLAGS
#if (SDL_MAJOR_VERSION == 1 && SDL_MINOR_VERSION < 3) // #if (SDL_MAJOR_VERSION == 1 && SDL_MINOR_VERSION < 3)
| SDL_FULLSCREEN // not implemented/working in SDL 1.3 SDL_compat.c | SDL_FULLSCREEN // not implemented/working in SDL 1.3 SDL_compat.c
#endif //#endif
); );
if (modes == (SDL_Rect **)0) if (modes == (SDL_Rect **)0)