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.

svn-id: r15873

2 files changed, 6 insertions, 3 deletions

diff --git a/simon/simon.cpp b/simon/simon.cpp
index 44332bc3ba..193619f937 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -661,14 +661,17 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst)
 		"\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;
diff --git a/simon/simon.h b/simon/simon.h
index b0c72491c1..b27781abe2 100644
--- a/simon/simon.h
+++ b/simon/simon.h
@@ -740,7 +740,7 @@ protected:
 
 	void resfile_read(void *dst, uint32 offs, uint32 size);
 
-	int init();
+	int init(GameDetector &detector);
 	int go();
 	void openGameFile();