Make sure looping music is restarted after loading a savegame, regardless

of how the savegame is loaded. (ScummVM adds two alternative methods: the
-x command-line parameter, and the restart/restore dialog at the beginning
of the game, which is only shown when there are savegames available.)

svn-id: r13386

1 files changed, 11 insertions, 0 deletions

diff --git a/sword2/save_rest.cpp b/sword2/save_rest.cpp
index 264416abe2..d14e1da50b 100644
--- a/sword2/save_rest.cpp
+++ b/sword2/save_rest.cpp
@@ -404,6 +404,17 @@ uint32 Sword2Engine::restoreFromBuffer(Memory *buffer, uint32 size) {
 
 	_loopingMusicId = _saveGameHeader.music_id;
 
+	// Restart any looping music. Originally this was - and still is - done
+	// in systemMenuMouse(), but with ScummVM we have other ways of
+	// restoring savegames so it's easier to put it here as well.
+
+	if (_loopingMusicId) {
+		pars[0] = _loopingMusicId;
+		pars[1] = FX_LOOP;
+		_logic->fnPlayMusic(pars);
+	} else
+		_logic->fnStopMusic(NULL);
+
 	// Write to walkthrough file (zebug0.txt)
 
 	debug(5, "RESTORED GAME \"%s\"", _saveGameHeader.description);