[Scummvm-cvs-logs] CVS: scummvm/kyra kyra.cpp,1.15,1.16 kyra.h,1.6,1.7

[Eugene Sandulenko]

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

Modified Files:
	kyra.cpp kyra.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: kyra.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- kyra.cpp	23 Nov 2004 00:48:34 -0000	1.15
+++ kyra.cpp	24 Nov 2004 00:13:59 -0000	1.16
@@ -123,10 +123,14 @@
 	}
 }
 
-int KyraEngine::init() {
+int KyraEngine::init(GameDetector &detector) {
 
 	// Initialize backen
-	_system->initSize(320, 200);
+	_system->beginGFXTransaction();
+		initCommonGFX(detector);
+		_system->initSize(320, 200);
+	_system->endGFXTransaction();
+
 	_screen = new uint8[320*200];
 	memset(_screen, 0, sizeof(uint8) * 320 * 200);
 

Index: kyra.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kyra.h	23 Nov 2004 00:03:20 -0000	1.6
+++ kyra.h	24 Nov 2004 00:13:59 -0000	1.7
@@ -68,7 +68,7 @@
 
 protected:
 	int go();
-	int init();
+	int init(GameDetector &detector);
 	void shutdown();
 	Resourcemanager* _resMgr;
 	MusicPlayer* _midiDriver;