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

[dreammaster]

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:
f176624dca XEEN: Fix FX instrument handling


Commit: f176624dca18a706b133ec3379293737da5bf8b2
    https://github.com/scummvm/scummvm/commit/f176624dca18a706b133ec3379293737da5bf8b2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-09-17T10:39:38-04:00

Commit Message:
XEEN: Fix FX instrument handling

Changed paths:
    engines/xeen/music.cpp



diff --git a/engines/xeen/music.cpp b/engines/xeen/music.cpp
index 3611824..c445832 100644
--- a/engines/xeen/music.cpp
+++ b/engines/xeen/music.cpp
@@ -622,9 +622,11 @@ bool AdlibMusicDriver::fxInjectMidi(const byte *&srcP, byte param) {
 }
 
 bool AdlibMusicDriver::fxPlayInstrument(const byte *&srcP, byte param) {
-	debugC(3, kDebugSound, "musPlayInstrument %d", param);
+	byte instrument = *srcP++;
+	debugC(3, kDebugSound, "fxPlayInstrument %d, %d", param, instrument);
+
 	if (!_exclude7 || param != 7)
-		playInstrument(param, _fxInstrumentPtrs[param]);
+		playInstrument(param, _fxInstrumentPtrs[instrument]);
 
 	return false;
 }