diff options
author | Robert Göffringmann | 2003-07-14 09:26:50 +0000 |
---|---|---|
committer | Robert Göffringmann | 2003-07-14 09:26:50 +0000 |
commit | e997d05b3c1e8e04acb7d11804aaf3880aa06dcf (patch) | |
tree | 539e6e7d48503375ca9a25336323e9f4bc401452 /sky | |
parent | d971845fab4473e6e2f609cd9463993223f55f80 (diff) | |
download | scummvm-rg350-e997d05b3c1e8e04acb7d11804aaf3880aa06dcf.tar.gz scummvm-rg350-e997d05b3c1e8e04acb7d11804aaf3880aa06dcf.tar.bz2 scummvm-rg350-e997d05b3c1e8e04acb7d11804aaf3880aa06dcf.zip |
fixed toggling music on/off after savegame restore
svn-id: r9007
Diffstat (limited to 'sky')
-rw-r--r-- | sky/control.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sky/control.cpp b/sky/control.cpp index 4d20239a54..094373d5b7 100644 --- a/sky/control.cpp +++ b/sky/control.cpp @@ -1452,7 +1452,9 @@ uint16 SkyControl::parseSaveData(uint8 *srcBuf) { _skyLogic->fnEnterSection(SkyLogic::_scriptVariables[CUR_SECTION], 0, 0); } _skyDisk->refreshFilesList(reloadList); - _skyMusic->startMusic((uint16)music); + SkyState::_systemVars.currentMusic = (uint16)music; + if (!(SkyState::_systemVars.systemFlags & SF_MUS_OFF)) + _skyMusic->startMusic((uint16)music); _savedMouse = (uint16)mouseType; SkyState::_systemVars.currentPalette = palette; // will be set when doControlPanel ends SkyState::_systemVars.systemFlags |= SF_GAME_RESTORED; // what's that for? |