From bcdfb4817292e583e2dbbcc76b3775fb49ec775f Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 27 Jan 2008 15:56:56 +0000
Subject: Cleanup.

svn-id: r30657
---
 engines/kyra/kyra.cpp    | 2 ++
 engines/kyra/kyra.h      | 2 ++
 engines/kyra/kyra_v1.cpp | 3 ---
 engines/kyra/kyra_v2.cpp | 4 ----
 4 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'engines/kyra')

diff --git a/engines/kyra/kyra.cpp b/engines/kyra/kyra.cpp
index faa8a83e7e..b0bc58ef49 100644
--- a/engines/kyra/kyra.cpp
+++ b/engines/kyra/kyra.cpp
@@ -140,10 +140,12 @@ int KyraEngine::init() {
 		error("_staticres->init() failed");
 	_timer = new TimerManager(this, _system);
 	assert(_timer);
+	setupTimers();
 	_scriptInterpreter = new ScriptHelper(this);
 	assert(_scriptInterpreter);
 
 	setupOpcodeTable();
+	readSettings();
 
 	_lang = 0;
 	Common::Language lang = Common::parseLanguage(ConfMan.get("language"));
diff --git a/engines/kyra/kyra.h b/engines/kyra/kyra.h
index 7460a34e9c..ea322f4d77 100644
--- a/engines/kyra/kyra.h
+++ b/engines/kyra/kyra.h
@@ -168,6 +168,8 @@ protected:
 	uint16 _gameSpeed;
 
 	// timer
+	virtual void setupTimers() = 0;
+
 	virtual void setWalkspeed(uint8 speed) = 0;
 	
 	// detection
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index cb65783558..8630fc9806 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -191,7 +191,6 @@ int KyraEngine_v1::init() {
 	_sound->setVolume(255);
 	_sound->loadSoundFile(0);
 
-	setupTimers();
 	setupButtonData();
 	setupMenu();
 
@@ -264,8 +263,6 @@ int KyraEngine_v1::init() {
 	assert(_movFacingTable);
 	_movFacingTable[0] = 8;
 
-	readSettings();
-
 	_skipFlag = false;
 
 	_marbleVaseItem = -1;
diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp
index 496a7bd709..529b4ffbd5 100644
--- a/engines/kyra/kyra_v2.cpp
+++ b/engines/kyra/kyra_v2.cpp
@@ -129,10 +129,6 @@ int KyraEngine_v2::init() {
 	_text = new TextDisplayer_v2(this, _screen);
 	assert(_text);
 
-	setupTimers();
-
-	readSettings();
-
 	_screen->loadFont(_screen->FID_6_FNT, "6.FNT");
 	_screen->loadFont(_screen->FID_8_FNT, "8FAT.FNT");
 	_screen->loadFont(_screen->FID_GOLDFONT_FNT, "GOLDFONT.FNT");
-- 
cgit v1.2.3