matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move SDL_GetVideoInfo before SDL_SetVideoMode so it will probably fix

Browse Source 
sizing issues for people.
This commit is contained in:
Savely Skresanov 2012-05-16 21:43:49 +07:00
parent a4d952a5c1
commit 66b946d5c6
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/graphics.c
View File

@ -3878,6 +3878,7 @@ void render_cursor(pixel *vid, int x, int y, int t, int rx, int ry)
#endif #endif
} }
SDL_VideoInfo info;
int sdl_opened = 0; int sdl_opened = 0;
int sdl_open(void) int sdl_open(void)
{ {
@ -3915,6 +3916,16 @@ int sdl_open(void)
SDL_WM_SetCaption("The Powder Toy", "Powder Toy"); SDL_WM_SetCaption("The Powder Toy", "Powder Toy");
atexit(SDL_Quit); atexit(SDL_Quit);
if(!sdl_opened)
info = *SDL_GetVideoInfo();
if (info.current_w<((XRES+BARSIZE)*sdl_scale) || info.current_h<((YRES+MENUSIZE)*sdl_scale))
{
sdl_scale = 1;
screen_err = 1;
fprintf(stderr, "Can't change scale factor, because screen resolution is too small");
}
#if defined(OGLR) #if defined(OGLR)
sdl_scrn=SDL_SetVideoMode(XRES*sdl_scale + BARSIZE*sdl_scale,YRES*sdl_scale + MENUSIZE*sdl_scale,32,SDL_OPENGL); sdl_scrn=SDL_SetVideoMode(XRES*sdl_scale + BARSIZE*sdl_scale,YRES*sdl_scale + MENUSIZE*sdl_scale,32,SDL_OPENGL);
SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
@ -4095,13 +4106,6 @@ int sdl_open(void)
loadShaders(); loadShaders();
} }
#else #else
SDL_VideoInfo* info = SDL_GetVideoInfo();
if (info->current_w<((XRES+BARSIZE)*sdl_scale) || info->current_h<((YRES+MENUSIZE)*sdl_scale))
{
sdl_scale = 1;
screen_err = 1;
fprintf(stderr, "Can't change scale factor, because screen resolution is too small");
}
#ifdef PIX16 #ifdef PIX16
if (kiosk_enable) if (kiosk_enable)
sdl_scrn=SDL_SetVideoMode(XRES*sdl_scale + BARSIZE*sdl_scale,YRES*sdl_scale + MENUSIZE*sdl_scale,16,SDL_FULLSCREEN|SDL_SWSURFACE); sdl_scrn=SDL_SetVideoMode(XRES*sdl_scale + BARSIZE*sdl_scale,YRES*sdl_scale + MENUSIZE*sdl_scale,16,SDL_FULLSCREEN|SDL_SWSURFACE);