[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.254,1.255

Travis Howell kirben at users.sourceforge.net
Fri Jul 18 08:38:03 CEST 2003


Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv31967/simon

Modified Files:
	simon.cpp 
Log Message:

Add game specific scaler override to sky
Add game specific scaler and full screen override to simon


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -d -r1.254 -r1.255
--- simon.cpp	15 Jul 2003 16:51:06 -0000	1.254
+++ simon.cpp	18 Jul 2003 15:37:06 -0000	1.255
@@ -24,6 +24,7 @@
 #include "simon/intern.h"
 #include "simon/vga.h"
 #include "sound/mididrv.h"
+#include "common/config-file.h"
 #include "common/file.h"
 #include "common/gameDetector.h"
 #include <errno.h>
@@ -173,6 +174,8 @@
 
 SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst)
 	: Engine(detector, syst), midi (syst) {
+	OSystem::Property prop;
+
 	MidiDriver *driver = detector->createMidi();
 	
 	_vc_ptr = 0;
@@ -454,6 +457,18 @@
 	_debugLevel = detector->_debugLevel;
 	_language = detector->_language;
 	_noSubtitles = detector->_noSubtitles;
+
+	// Override global scaler with any game-specific define
+	if (g_config->get("gfx_mode")) {
+		prop.gfx_mode = detector->parseGraphicsMode(g_config->get("gfx_mode"));
+		_system->property(OSystem::PROP_SET_GFX_MODE, &prop);
+	}
+
+	// Override global scaler 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);
+	}
 }
 
 SimonEngine::~SimonEngine() {





More information about the Scummvm-git-logs mailing list