games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity

Let SDL decide which pixel depth is the best. This fixes the sluggish interface under linux. Removed SDL_DOUBLEBUF for it's only valid with SDL_HWSURFACE.

Browse Source
This commit is contained in:
Frank Zago 2009-05-17 04:14:30 +00:00
parent bc506bbc77
commit 5ce428cf1d
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CMT.cpp
View File

@ -65,7 +65,7 @@ boost::mutex eventsM;
TTF_Font * TNRB16, *TNR, *GEOR13, *GEORXX, *GEORM, *GEOR16; TTF_Font * TNRB16, *TNR, *GEOR13, *GEORXX, *GEORM, *GEOR16;
void processCommand(const std::string &message, CClient *&client); void processCommand(const std::string &message, CClient *&client);
void setScreenRes(int w, int h, int bpp, bool fullscreen); static void setScreenRes(int w, int h, int bpp, bool fullscreen);
#ifndef __GNUC__ #ifndef __GNUC__
int _tmain(int argc, _TCHAR* argv[]) int _tmain(int argc, _TCHAR* argv[])
@ -337,13 +337,24 @@ void processCommand(const std::string &message, CClient *&client)
} }
} }
void setScreenRes(int w, int h, int bpp, bool fullscreen) static void setScreenRes(int w, int h, int bpp, bool fullscreen)
{ {
if(screen) //screen has been already inited if(screen) //screen has been already initialized
SDL_QuitSubSystem(SDL_INIT_VIDEO); SDL_QuitSubSystem(SDL_INIT_VIDEO);
SDL_InitSubSystem(SDL_INIT_VIDEO); SDL_InitSubSystem(SDL_INIT_VIDEO);
screen = SDL_SetVideoMode(conf.cc.resx,conf.cc.resy,conf.cc.bpp,SDL_SWSURFACE|SDL_DOUBLEBUF|(conf.cc.fullscreen?SDL_FULLSCREEN:0)); //initializing important global surface
// VCMI will only work with 3 or 4 bytes per pixel
if (bpp < 24) bpp = 24;
if (bpp > 32) bpp = 32;
// Try to use the best screen depth for the display
if (((bpp = SDL_VideoModeOK(w, h, bpp, SDL_SWSURFACE|(fullscreen?SDL_FULLSCREEN:0))) == 0) ||
((screen = SDL_SetVideoMode(w, h, bpp, SDL_SWSURFACE|(fullscreen?SDL_FULLSCREEN:0))) == NULL)) {
tlog1 << "Requested screen resolution is not available (" << w << "x" << h << ")\n";
throw "Requested screen resolution is not available\n";
}
if(screen2) if(screen2)
SDL_FreeSurface(screen2); SDL_FreeSurface(screen2);
screen2 = CSDL_Ext::copySurface(screen); screen2 = CSDL_Ext::copySurface(screen);