aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2014-07-03 20:37:08 -0400
committerPaul Gilbert2014-07-03 20:37:08 -0400
commita7a8b49567c8565d63532f7d039d61f045cf8bab (patch)
tree505c2651520ad82c311e9a5d558608dd7c7770cc
parent886d48b843ab4b195a3b7bd703ef337afc728f3f (diff)
downloadscummvm-rg350-a7a8b49567c8565d63532f7d039d61f045cf8bab.tar.gz
scummvm-rg350-a7a8b49567c8565d63532f7d039d61f045cf8bab.tar.bz2
scummvm-rg350-a7a8b49567c8565d63532f7d039d61f045cf8bab.zip
VOYEUR: Fix double apartment enter animation when loading save from launcher
-rw-r--r--engines/voyeur/files_threads.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp
index 256aedf50e..0615c67ba0 100644
--- a/engines/voyeur/files_threads.cpp
+++ b/engines/voyeur/files_threads.cpp
@@ -1007,8 +1007,10 @@ int ThreadResource::doApt() {
if (_vm->_loadGameSlot != -1) {
// Load a savegame
- _vm->loadGame(_vm->_loadGameSlot);
+ int slot = _vm->_loadGameSlot;
_vm->_loadGameSlot = -1;
+ _vm->loadGame(slot);
+
_vm->_eventsManager->showCursor();
}
@@ -1597,7 +1599,9 @@ void ThreadResource::loadTheApt() {
_vm->_voy->_aptLoadMode = -1;
if (_vm->_voy->_aptLoadMode != -1) {
- doAptAnim(1);
+ if (_vm->_loadGameSlot != -1)
+ doAptAnim(1);
+
_vm->_bVoy->getBoltGroup(_vm->_playStampGroupId);
_vm->_voy->_aptLoadMode = -1;
_vm->_graphicsManager->_backgroundPage = _vm->_bVoy->boltEntry(