[Scummvm-cvs-logs] CVS: scummvm/sky sky.cpp,1.153,1.154

[Joost Peters]

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

Modified Files:
	sky.cpp 
Log Message:
Move initialisation from constructor to initialise().


Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- sky.cpp	11 Nov 2004 10:14:35 -0000	1.153
+++ sky.cpp	15 Nov 2004 20:44:56 -0000	1.154
@@ -115,18 +115,7 @@
 SystemVars SkyEngine::_systemVars = {0, 0, 0, 0, 4316, 0, 0, false, false };
 
 SkyEngine::SkyEngine(GameDetector *detector, OSystem *syst)
-	: Engine(syst) {
-	
-	if (!_mixer->isReady())
-		warning("Sound initialisation failed.");
-
-	_mixer->setVolume(ConfMan.getInt("sfx_volume")); //unnecessary?
-	
-	_floppyIntro = ConfMan.getBool("alt_intro");
-
-	_fastMode = 0;
-
-	_system->initSize(320, 200);
+	: Engine(syst), _fastmode(0) {
 }
 
 SkyEngine::~SkyEngine() {
@@ -257,6 +246,14 @@
 }
 
 void SkyEngine::initialise(void) {
+	_system->initSize(320, 200);
+
+	if (!_mixer->isReady())
+		warning("Sound initialisation failed");
+
+	 _mixer->setVolume(ConfMan.getInt("sfx_volume"));
+	_floppyIntro = ConfMan.getBool("alt_intro");
+
 	_skyDisk = new Disk(_gameDataPath);
 	_skySound = new Sound(_mixer, _skyDisk, ConfMan.getInt("sfx_volume"));