From 31e434dcf1e46510606efa3025c24c17ace379c6 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Wed, 24 Nov 2004 00:14:21 +0000
Subject: 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
---
 scumm/scumm.cpp | 7 +++++--
 scumm/scumm.h   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'scumm')

diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index bdb91a1d99..864d261207 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -976,10 +976,13 @@ ScummEngine_v70he::ScummEngine_v70he(GameDetector *detector, OSystem *syst, cons
 #pragma mark --- Initialization ---
 #pragma mark -
 
-int ScummEngine::init() {
+int ScummEngine::init(GameDetector &detector) {
 
 	// Initialize backend
-	_system->initSize(_screenWidth, _screenHeight);
+	_system->beginGFXTransaction();
+		initCommonGFX(detector);
+		_system->initSize(_screenWidth, _screenHeight);
+	_system->endGFXTransaction();
 
 	int cd_num = ConfMan.getInt("cdrom");
 	if (cd_num >= 0 && (_features & GF_AUDIOTRACKS))
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 43b7728958..25aeaac501 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -388,7 +388,7 @@ public:
 	int go();
 
 	// Init functions
-	int init();
+	int init(GameDetector &detector);
 
 	virtual void setupScummVars();
 	void initScummVars();
-- 
cgit v1.2.3