aboutsummaryrefslogtreecommitdiff
path: root/engines/saga
diff options
context:
space:
mode:
authorFilippos Karapetis2017-08-21 22:30:35 +0300
committerFilippos Karapetis2017-08-21 22:31:33 +0300
commit1fd3d105d3667865767044012d008635e33c4266 (patch)
treedb7c4b0524d5d63f00e5f4c1262d3ddba1b5d1c1 /engines/saga
parent98da344a673a79d8b9d4517ebf955e683844a962 (diff)
downloadscummvm-rg350-1fd3d105d3667865767044012d008635e33c4266.tar.gz
scummvm-rg350-1fd3d105d3667865767044012d008635e33c4266.tar.bz2
scummvm-rg350-1fd3d105d3667865767044012d008635e33c4266.zip
SAGA: Fix bug #10009, when loading games
Abort any scene entry protagonist animations and auto-cue speeches when loading saved games, as the protagonist can get stuck in scene entry animations
Diffstat (limited to 'engines/saga')
-rw-r--r--engines/saga/saveload.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/engines/saga/saveload.cpp b/engines/saga/saveload.cpp
index 1a131bf5cc..a687a68046 100644
--- a/engines/saga/saveload.cpp
+++ b/engines/saga/saveload.cpp
@@ -381,6 +381,12 @@ void SagaEngine::load(const char *fileName) {
_music->setVolume(volume);
_interface->draw();
+
+ // Abort any scene entry protagonist animations and auto-cue speeches.
+ // Fixes bug #10009.
+ _actor->abortAllSpeeches();
+ _actor->_protagonist->_location = _actor->_protagonist->_finalTarget;
+ _actor->actorEndWalk(ID_PROTAG, true);
}
} // End of namespace Saga