aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoost Peters2003-09-13 01:45:12 +0000
committerJoost Peters2003-09-13 01:45:12 +0000
commitd517558b106b4e258be4811820de5a046a4e3482 (patch)
tree35bdfd6c9b620b4df0085898c61807c9470868bc
parentcc427cdcdd55c0a9261018e4e4efa27e7017fb66 (diff)
downloadscummvm-rg350-d517558b106b4e258be4811820de5a046a4e3482.tar.gz
scummvm-rg350-d517558b106b4e258be4811820de5a046a4e3482.tar.bz2
scummvm-rg350-d517558b106b4e258be4811820de5a046a4e3482.zip
proper fix for bug #791207
svn-id: r10202
-rw-r--r--sky/logic.cpp1
-rw-r--r--sky/sky.cpp6
2 files changed, 1 insertions, 6 deletions
diff --git a/sky/logic.cpp b/sky/logic.cpp
index 02c4f3cb8b..ccddf1b17a 100644
--- a/sky/logic.cpp
+++ b/sky/logic.cpp
@@ -66,6 +66,7 @@ SkyLogic::SkyLogic(SkyScreen *skyScreen, SkyDisk *skyDisk, SkyText *skyText, Sky
_moduleList[i] = 0;
_stackPtr = 0;
+ _currentSection = 0xFF; //force music & sound reload
initScriptVariables();
}
diff --git a/sky/sky.cpp b/sky/sky.cpp
index f9355a8ca6..4981149806 100644
--- a/sky/sky.cpp
+++ b/sky/sky.cpp
@@ -200,12 +200,6 @@ void SkyState::go() {
if (introSkipped)
_skyControl->restartGame();
- else { //workaround for bug #791207
- _skySound->loadSection(1);
- _skyMusic->loadSection(1);
- _skyMusic->startMusic(2);
- _systemVars.currentMusic = 2;
- }
_lastSaveTime = _system->get_msecs();