[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.38,2.39

[James Brown]

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

Modified Files:
	scummvm.cpp 
Log Message:
Early init of the scaler - to prevent ComI trying to use a huge window by default.

This may require porters to make a small backend change, not to reinit a scaler on hotswap if the display has not been init_size'ed.


Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.38
retrieving revision 2.39
diff -u -d -r2.38 -r2.39
--- scummvm.cpp	13 Jan 2003 15:27:06 -0000	2.38
+++ scummvm.cpp	13 Jan 2003 18:59:50 -0000	2.39
@@ -124,6 +124,12 @@
 	_sound->_sound_volume_sfx = detector->_sfx_volume;	
 	_sound->_sound_volume_music = detector->_music_volume;	
 
+	// 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);
+	}
+
 	/* Initialize backend */
 	syst->init_size(_realWidth, _realHeight);
 	prop.cd_num = detector->_cdrom;
@@ -136,11 +142,6 @@
         		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