[Scummvm-cvs-logs] SF.net SVN: scummvm: [30657] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 30657
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30657&view=rev
Author:   lordhoto
Date:     2008-01-27 07:56:56 -0800 (Sun, 27 Jan 2008)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra.cpp
    scummvm/trunk/engines/kyra/kyra.h
    scummvm/trunk/engines/kyra/kyra_v1.cpp
    scummvm/trunk/engines/kyra/kyra_v2.cpp

Modified: scummvm/trunk/engines/kyra/kyra.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra.cpp	2008-01-27 15:54:57 UTC (rev 30656)
+++ scummvm/trunk/engines/kyra/kyra.cpp	2008-01-27 15:56:56 UTC (rev 30657)
@@ -140,10 +140,12 @@
 		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"));

Modified: scummvm/trunk/engines/kyra/kyra.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra.h	2008-01-27 15:54:57 UTC (rev 30656)
+++ scummvm/trunk/engines/kyra/kyra.h	2008-01-27 15:56:56 UTC (rev 30657)
@@ -168,6 +168,8 @@
 	uint16 _gameSpeed;
 
 	// timer
+	virtual void setupTimers() = 0;
+
 	virtual void setWalkspeed(uint8 speed) = 0;
 	
 	// detection

Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp	2008-01-27 15:54:57 UTC (rev 30656)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp	2008-01-27 15:56:56 UTC (rev 30657)
@@ -191,7 +191,6 @@
 	_sound->setVolume(255);
 	_sound->loadSoundFile(0);
 
-	setupTimers();
 	setupButtonData();
 	setupMenu();
 
@@ -264,8 +263,6 @@
 	assert(_movFacingTable);
 	_movFacingTable[0] = 8;
 
-	readSettings();
-
 	_skipFlag = false;
 
 	_marbleVaseItem = -1;

Modified: scummvm/trunk/engines/kyra/kyra_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-01-27 15:54:57 UTC (rev 30656)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp	2008-01-27 15:56:56 UTC (rev 30657)
@@ -129,10 +129,6 @@
 	_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");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.