aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sky/sky.cpp21
1 files changed, 9 insertions, 12 deletions
diff --git a/sky/sky.cpp b/sky/sky.cpp
index 4536ac5958..2e17f86e2c 100644
--- a/sky/sky.cpp
+++ b/sky/sky.cpp
@@ -115,18 +115,7 @@ void **SkyEngine::_itemList[300];
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::go() {
}
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"));