[Scummvm-git-logs] scummvm master -> 3594f3e12c74b908b9b9079a37017ac0f81c1ca3

[athrxx]

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:
cb519ee7cc KYRA: (MAC) - fix typo
3594f3e12c KYRA: (EOB II) - fix regression


Commit: cb519ee7cc1c08aa5b5dabc414474b462963e166
    https://github.com/scummvm/scummvm/commit/cb519ee7cc1c08aa5b5dabc414474b462963e166
Author: athrxx (athrxx at scummvm.org)
Date: 2023-05-04T19:02:06+02:00

Commit Message:
KYRA: (MAC) - fix typo

Changed paths:
    engines/kyra/sound/drivers/halestorm.cpp


diff --git a/engines/kyra/sound/drivers/halestorm.cpp b/engines/kyra/sound/drivers/halestorm.cpp
index f8d6e831086..2314a3c8999 100644
--- a/engines/kyra/sound/drivers/halestorm.cpp
+++ b/engines/kyra/sound/drivers/halestorm.cpp
@@ -713,7 +713,7 @@ bool HSMidiParser::loadTracks(HSSong &song) {
 	if (in >= end)
 		return false;
 
-	int tps = READ_BE_UINT16(in + 12);
+	int tps = READ_BE_INT16(in + 12);
 	if (tps >= 0)
 		song.setTicksPerSecond(tps);
 


Commit: 3594f3e12c74b908b9b9079a37017ac0f81c1ca3
    https://github.com/scummvm/scummvm/commit/3594f3e12c74b908b9b9079a37017ac0f81c1ca3
Author: athrxx (athrxx at scummvm.org)
Date: 2023-05-04T19:02:12+02:00

Commit Message:
KYRA: (EOB II) - fix regression

(party transfer broken for newer savegame versions)

Changed paths:
    engines/kyra/gui/saveload_eob.cpp


diff --git a/engines/kyra/gui/saveload_eob.cpp b/engines/kyra/gui/saveload_eob.cpp
index 923fcfbe6b3..5da0b35fb4e 100644
--- a/engines/kyra/gui/saveload_eob.cpp
+++ b/engines/kyra/gui/saveload_eob.cpp
@@ -113,7 +113,7 @@ Common::Error EoBCoreEngine::loadGameState(int slot) {
 	if (slot == -1) {
 		// Skip all settings which aren't necessary for party transfer.
 		// Jump directly to the items list.
-		in.skip(header.version > 18 ? 124 : 108);
+		in.skip(header.version > 18 ? (header.version < 21 ? 124 : 120) : 108);
 	} else {
 		_currentLevel = in.readByte();
 		_currentSub = in.readSByte();