diff options
| author | athrxx | 2019-07-17 00:30:35 +0200 |
|---|---|---|
| committer | athrxx | 2019-07-17 17:26:52 +0200 |
| commit | 4c45f9f39f3aa0bfee70fc81b7d0938de12dfdf0 (patch) | |
| tree | a0bad5ac333b274f0ca80713ea793d681f14f37a | |
| parent | 4c6ff7843f12c5d791ca5ddda789e77216669e69 (diff) | |
| download | scummvm-rg350-4c45f9f39f3aa0bfee70fc81b7d0938de12dfdf0.tar.gz scummvm-rg350-4c45f9f39f3aa0bfee70fc81b7d0938de12dfdf0.tar.bz2 scummvm-rg350-4c45f9f39f3aa0bfee70fc81b7d0938de12dfdf0.zip | |
SCUMM: (iMUSE/Amiga) - fix INDY4 instruments handling
FOA Amiga uses 'ROL ' resources (unlike MI2 which has 'AMI ' resources). So our imuse player treated those as MT32 tracks playing on a non-MT32 device and applied GM mapping. Which of course messed up the instruments.
| -rw-r--r-- | engines/scumm/imuse/imuse.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp index 37a0465153..de592972aa 100644 --- a/engines/scumm/imuse/imuse.cpp +++ b/engines/scumm/imuse/imuse.cpp @@ -158,11 +158,11 @@ bool IMuseInternal::isMT32(int sound) { case MKTAG('S', 'P', 'K', ' '): return false; - case MKTAG('A', 'M', 'I', ' '): // Amiga + case MKTAG('A', 'M', 'I', ' '): // MI2 Amiga return false; - case MKTAG('R', 'O', 'L', ' '): - return true; + case MKTAG('R', 'O', 'L', ' '): // Unfortunately FOA Amiga also uses this resource type + return !_isAmiga; case MKTAG('M', 'A', 'C', ' '): // Occurs in the Mac version of FOA and MI2 return false; |