[Scummvm-git-logs] scummvm master -> 1fd3d105d3667865767044012d008635e33c4266

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
98da344a67 SAGA: Remove obsolete disabled code
1fd3d105d3 SAGA: Fix bug #10009, when loading games


Commit: 98da344a673a79d8b9d4517ebf955e683844a962
    https://github.com/scummvm/scummvm/commit/98da344a673a79d8b9d4517ebf955e683844a962
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2017-08-21T22:31:33+03:00

Commit Message:
SAGA: Remove obsolete disabled code

Changed paths:
    engines/saga/music.cpp


diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index 0bc1e8a..2d3566c 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -129,7 +129,6 @@ void MusicDriver::play(SagaEngine *vm, ByteArray *buffer, bool loop) {
 
 	// Handle music looping
 	_parser->property(MidiParser::mpAutoLoop, loop);
-//	_isLooping = loop;
 
 	_isPlaying = true;
 }
@@ -150,7 +149,6 @@ void MusicDriver::playQuickTime(const Common::String &musicName, bool loop) {
 
 	// Handle music looping
 	_parser->property(MidiParser::mpAutoLoop, loop);
-//	_isLooping = loop;
 
 	_isPlaying = true;
 }


Commit: 1fd3d105d3667865767044012d008635e33c4266
    https://github.com/scummvm/scummvm/commit/1fd3d105d3667865767044012d008635e33c4266
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2017-08-21T22:31:33+03:00

Commit Message:
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

Changed paths:
    engines/saga/saveload.cpp


diff --git a/engines/saga/saveload.cpp b/engines/saga/saveload.cpp
index 1a131bf..a687a68 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