diff options
author | Robert Göffringmann | 2003-07-01 16:06:09 +0000 |
---|---|---|
committer | Robert Göffringmann | 2003-07-01 16:06:09 +0000 |
commit | ffaeb5424fca2eba2528f8c2d9db674d47f03395 (patch) | |
tree | d321b72c5b05137de83a60f8bfbe3e19e0a04f5d /sky/control.cpp | |
parent | 09e47bad3d6b7294c9dd494790c2c5a4bfeff0b0 (diff) | |
download | scummvm-rg350-ffaeb5424fca2eba2528f8c2d9db674d47f03395.tar.gz scummvm-rg350-ffaeb5424fca2eba2528f8c2d9db674d47f03395.tar.bz2 scummvm-rg350-ffaeb5424fca2eba2528f8c2d9db674d47f03395.zip |
fixed mouse restore on savegame restore and bug in fnTheyStartSub
svn-id: r8690
Diffstat (limited to 'sky/control.cpp')
-rw-r--r-- | sky/control.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sky/control.cpp b/sky/control.cpp index 20e857867c..08b94c31c2 100644 --- a/sky/control.cpp +++ b/sky/control.cpp @@ -301,7 +301,7 @@ void SkyControl::doControlPanel(void) { drawMainPanel(); - uint16 savedMouse = _skyMouse->giveCurrentMouseType(); + _savedMouse = _skyMouse->giveCurrentMouseType(); _skyMouse->spriteMouse(MOUSE_NORMAL,0,0); bool quitPanel = false; @@ -343,7 +343,7 @@ void SkyControl::doControlPanel(void) { _skyScreen->forceRefresh(); _skyScreen->setPalette((uint8*)SkyState::fetchCompact(SkyState::_systemVars.currentPalette)); removePanel(); - _skyMouse->spriteMouse(savedMouse, 0, 0); + _skyMouse->spriteMouse(_savedMouse, 0, 0); } uint16 SkyControl::handleClick(SkyConResource *pButton) { @@ -950,7 +950,7 @@ uint32 SkyControl::prepareSaveData(uint8 *destBuf) { //TODO: save queued sfx STOSD(destPos, _skyText->giveCurrentCharSet()); - STOSD(destPos, _skyMouse->giveCurrentMouseType()); + STOSD(destPos, _savedMouse); STOSD(destPos, SkyState::_systemVars.currentPalette); for (cnt = 0; cnt < 838; cnt++) STOSD(destPos, SkyLogic::_scriptVariables[cnt]); @@ -1156,7 +1156,7 @@ uint16 SkyControl::parseSaveData(uint8 *srcBuf) { _skyDisk->refreshFilesList(reloadList); _skyMusic->startMusic((uint16)music); _skyText->fnSetFont(charSet); - _skyMouse->spriteMouse((uint16)mouseType, 0, 0); + _savedMouse = (uint16)mouseType; SkyState::_systemVars.currentPalette = palette; // will be set when doControlPanel ends SkyState::_systemVars.systemFlags |= SF_GAME_RESTORED; // what's that for? |