[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.32,2.33

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv1990/scumm

Modified Files:
	scummvm.cpp 
Log Message:
Fix game-specific scalers overriding global... when game started from Launcher


Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.32
retrieving revision 2.33
diff -u -d -r2.32 -r2.33
--- scummvm.cpp	6 Jan 2003 18:46:07 -0000	2.32
+++ scummvm.cpp	12 Jan 2003 06:44:59 -0000	2.33
@@ -130,10 +130,18 @@
 	if (prop.cd_num >= 0 && (_features & GF_AUDIOTRACKS))
 		syst->property(OSystem::PROP_OPEN_CD, &prop);
 
+	// Override global fullscreen setting with any game-specific define
 	if (g_config->getBool("fullscreen", false)) {
- 		if (!_system->property(OSystem::PROP_GET_FULLSCREEN, 0))
-        		_system->property(OSystem::PROP_TOGGLE_FULLSCREEN, 0);
+ 		if (!syst->property(OSystem::PROP_GET_FULLSCREEN, 0))
+        		syst->property(OSystem::PROP_TOGGLE_FULLSCREEN, 0);
  	}
+
+	// Override global scaler with any game-specific define
+	if (g_config->get("gfx_mode")) {
+		prop.gfx_mode = detector->parseGraphicsMode(g_config->get("gfx_mode"));
+		syst->property(OSystem::PROP_SET_GFX_MODE, &prop);
+	}
+
 #ifndef __GP32__ //ph0x FIXME, "quick dirty hack"
 	/* Bind the mixer to the system => mixer will be invoked
 	 * automatically when samples need to be generated */