[Scummvm-cvs-logs] scummvm master -> f3ea868cf6b3603e88e0899fef6e71bcc800e481

lordhoto lordhoto at gmail.com
Thu Feb 24 23:05:34 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f3ea868cf6 SDL: Prevent graphics manager hotswapping on startup. (This time for real)


Commit: f3ea868cf6b3603e88e0899fef6e71bcc800e481
    https://github.com/scummvm/scummvm/commit/f3ea868cf6b3603e88e0899fef6e71bcc800e481
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-02-24T14:04:34-08:00

Commit Message:
SDL: Prevent graphics manager hotswapping on startup. (This time for real)

Changed paths:
    backends/platform/sdl/sdl.cpp



diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 0bc0119..bddb48c 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -128,7 +128,6 @@ void OSystem_SDL::init() {
 #ifdef USE_OPENGL
 	// Setup a list with both SDL and OpenGL graphics modes
 	setupGraphicsModes();
-	_graphicsMode = _sdlModesCount;
 #endif
 }
 
@@ -149,11 +148,15 @@ void OSystem_SDL::initBackend() {
 			Common::String gfxMode(ConfMan.get("gfx_mode"));
 			bool use_opengl = false;
 			const OSystem::GraphicsMode *mode = OpenGLSdlGraphicsManager::supportedGraphicsModes();
+			int i = 0;
 			while (mode->name) {
-				if (scumm_stricmp(mode->name, gfxMode.c_str()) == 0)
+				if (scumm_stricmp(mode->name, gfxMode.c_str()) == 0) {
+					_graphicsMode = i + _sdlModesCount;
 					use_opengl = true;
+				}
 
 				mode++;
+				++i;
 			}
 
 			// If the gfx_mode is from OpenGL, create the OpenGL graphics manager






More information about the Scummvm-git-logs mailing list