aboutsummaryrefslogtreecommitdiff
path: root/sky/sky.cpp
diff options
context:
space:
mode:
authorJoost Peters2003-04-21 20:58:53 +0000
committerJoost Peters2003-04-21 20:58:53 +0000
commit83684226c0d4ee56dd87fcd4cce127880ecaea31 (patch)
treed898042e7a12d6e4fe5d2d0c05b2441b6b378892 /sky/sky.cpp
parent93e28c81ff88376132bc40acea3fdb15416a6128 (diff)
downloadscummvm-rg350-83684226c0d4ee56dd87fcd4cce127880ecaea31.tar.gz
scummvm-rg350-83684226c0d4ee56dd87fcd4cce127880ecaea31.tar.bz2
scummvm-rg350-83684226c0d4ee56dd87fcd4cce127880ecaea31.zip
Applied patch #725152 - Sky Music driver by LavosSpawn
svn-id: r7069
Diffstat (limited to 'sky/sky.cpp')
-rw-r--r--sky/sky.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/sky/sky.cpp b/sky/sky.cpp
index 7fcddd6e71..0e9dc2239f 100644
--- a/sky/sky.cpp
+++ b/sky/sky.cpp
@@ -83,6 +83,7 @@ void SkyState::go() {
_dump_file = stdout;
initialise();
+
if (!isDemo(_gameVersion) || isCDVersion(_gameVersion))
intro();
@@ -95,11 +96,10 @@ void SkyState::initialise(void) {
//initialise_memory();
initTimer();
- //init_music();
_sound = new SkySound(_mixer);
-
_skyDisk = new SkyDisk(_gameDataPath);
+ _music = new SkyMusic(_mixer,_skyDisk);
_gameVersion = _skyDisk->determineGameVersion();
_skyText = getSkyText();