[Scummvm-git-logs] scummvm master -> 8b5e3e83aaadf1096a2588e4e6dabc30332628f9

[sluicebox]

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:
8b5e3e83aa SCI: Fix LSL2-Early MT32 check. PVS-Studio V547


Commit: 8b5e3e83aaadf1096a2588e4e6dabc30332628f9
    https://github.com/scummvm/scummvm/commit/8b5e3e83aaadf1096a2588e4e6dabc30332628f9
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-10-29T17:51:10-07:00

Commit Message:
SCI: Fix LSL2-Early MT32 check. PVS-Studio V547

This was a typo in a commit from 12 years ago that added fixes for MT32
in the early version of LSL2. The intent was to not immediately send
after-SysEx text when initializing LSL2-early, but instead it was always
sent as the else branch was impossible to take.

It's unclear if this error any effect. At least under the emulator, the
correct LSL2-early text displayed before today's fix and after.

See: 88235cee7cd48c03401f956579abdeaf95227993

Changed paths:
    engines/sci/sound/drivers/midi.cpp


diff --git a/engines/sci/sound/drivers/midi.cpp b/engines/sci/sound/drivers/midi.cpp
index e923167bb3f..5a5dea5d06a 100644
--- a/engines/sci/sound/drivers/midi.cpp
+++ b/engines/sci/sound/drivers/midi.cpp
@@ -852,12 +852,12 @@ void MidiPlayer_Midi::readMt32DrvData() {
 		// Send before-SysEx text
 		sendMt32SysEx(0x200000, f, 20);
 
-		if (size != 2271) {
+		if (size != 2771) {
 			// Send after-SysEx text (SSCI sends this before every song).
 			// There aren't any SysEx calls in old drivers, so this can
 			// be sent right after the before-SysEx text.
 			sendMt32SysEx(0x200000, f, 20);
-		} else {
+		} else { // LSL2 early
 			// Skip the after-SysEx text in the newer patch version, we'll send
 			// it after the SysEx messages are sent.
 			f.skip(20);