[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.464,1.465 simon.h,1.128,1.129

Eugene Sandulenko sev at users.sourceforge.net
Tue Nov 23 16:16:13 CET 2004


Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7792/simon

Modified Files:
	simon.cpp simon.h 
Log Message:
Fix a`ll engines. They work, though current fix is just temporary.
There are plans to add some brains to GameDetector class, which will let us
avoid passing detector to init() method.


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -d -r1.464 -r1.465
--- simon.cpp	23 Nov 2004 00:03:22 -0000	1.464
+++ simon.cpp	24 Nov 2004 00:14:16 -0000	1.465
@@ -661,14 +661,17 @@
 		"\x5\x5\x4\x6\x5\x3\x4\x5\x6\x3\x5\x5\x4\x6\x5\x3\x4\x6\x5\x6\x6\x6\x5\x5\x5\x6\x5\x6\x6\x6\x6\x6", 32);
 }
 
-int SimonEngine::init() {
+int SimonEngine::init(GameDetector &detector) {
 	// Setup mixer
 	if (!_mixer->isReady())
 		warning("Sound initialization failed. "
 						"Features of the game that depend on sound synchronization will most likely break");
 	set_volume(ConfMan.getInt("sfx_volume"));
 
-	_system->initSize(320, 200);
+	_system->beginGFXTransaction();
+		initCommonGFX(detector);
+		_system->initSize(320, 200);
+	_system->endGFXTransaction();
 
 	// Setup midi driver
 	MidiDriver *driver = 0;

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- simon.h	23 Nov 2004 00:03:23 -0000	1.128
+++ simon.h	24 Nov 2004 00:14:17 -0000	1.129
@@ -740,7 +740,7 @@
 
 	void resfile_read(void *dst, uint32 offs, uint32 size);
 
-	int init();
+	int init(GameDetector &detector);
 	int go();
 	void openGameFile();
 





More information about the Scummvm-git-logs mailing list