[Scummvm-git-logs] scummvm master -> b118133cdfffd4bc5e102a23672916ed2034c23b

[eriktorbjorn]

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

Summary:
b118133cdf SCUMM: Zero Mac instrument information if it can't be read from savegame


Commit: b118133cdfffd4bc5e102a23672916ed2034c23b
    https://github.com/scummvm/scummvm/commit/b118133cdfffd4bc5e102a23672916ed2034c23b
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2022-03-14T19:16:32+01:00

Commit Message:
SCUMM: Zero Mac instrument information if it can't be read from savegame

If we can't read the instrument pos/sub-pos information from the
savegame, it's probably safer to set them to 0 than to leave them
undefined.

Changed paths:
    engines/scumm/players/player_mac.cpp


diff --git a/engines/scumm/players/player_mac.cpp b/engines/scumm/players/player_mac.cpp
index 60864154e8d..93128e10b65 100644
--- a/engines/scumm/players/player_mac.cpp
+++ b/engines/scumm/players/player_mac.cpp
@@ -136,6 +136,9 @@ void Player_Mac::saveLoadWithSerializer(Common::Serializer &s) {
 				// caused the channel data to be saved a second time, instead
 				// of the instrument data.
 				syncWithSerializer(s, _channel[i]);
+
+				_channel[i]._instrument._pos = 0;
+				_channel[i]._instrument._subPos = 0;
 			} else {
 				syncWithSerializer(s, _channel[i]._instrument);
 			}