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

[sev-]

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:
8c34f865e8 CINE: FW: Fix Roland MT-32 sample playing.


Commit: 8c34f865e8bc4ed614db349ae08f66916cee507a
    https://github.com/scummvm/scummvm/commit/8c34f865e8bc4ed614db349ae08f66916cee507a
Author: Kari Salminen (kari.salminen at gmail.com)
Date: 2020-08-01T10:42:21+02:00

Commit Message:
CINE: FW: Fix Roland MT-32 sample playing.

Fix bug #11547 ("CINE: FW: Game crashes during intro with MT-32 music").
Future Wars PC disassembly passes 256 to writeInstrument and
writeInstrument overwrites it with value 246 here. So the value
becomes 246 in the end.

Changed paths:
    engines/cine/sound.cpp


diff --git a/engines/cine/sound.cpp b/engines/cine/sound.cpp
index 970690f79c..135dda55f6 100644
--- a/engines/cine/sound.cpp
+++ b/engines/cine/sound.cpp
@@ -768,7 +768,7 @@ void MidiSoundDriverH32::playSample(const byte *data, int size, int channel, int
 	if (data[0] < 0x80) {
 		selectInstrument(channel, data[0] / 0x40, data[0] % 0x40, volume);
 	} else {
-		writeInstrument(channel * 512 + 0x80000, data + 1, size - 1);
+		writeInstrument(channel * 512 + 0x80000, data + 1, 256);
 		selectInstrument(channel, 2, channel, volume);
 	}