diff options
| author | Martin Kiewitz | 2015-12-29 01:44:11 +0100 |
|---|---|---|
| committer | Martin Kiewitz | 2015-12-29 01:44:11 +0100 |
| commit | 0dd760724e37b70bfaade2c34c12e34fab4d4b71 (patch) | |
| tree | f44a01f75f84d65db8e2b737742085db9f878899 /engines/sci/sound/midiparser_sci.cpp | |
| parent | 00e0d68a9f4b85ac66f757dd8603036b82a566e6 (diff) | |
| download | scummvm-rg350-0dd760724e37b70bfaade2c34c12e34fab4d4b71.tar.gz scummvm-rg350-0dd760724e37b70bfaade2c34c12e34fab4d4b71.tar.bz2 scummvm-rg350-0dd760724e37b70bfaade2c34c12e34fab4d4b71.zip | |
SCI32: split up SCI2.1 into EARLY/MIDDLE/LATE
- Detection works via signatures (couldn't find a better way)
- new kString subcalls were introduced SCI2.1 LATE
- kString now has signatures and is split via subcall table
- kString fix, so that KQ7 doesn't crash, when starting a chapter
- Sci2StringFunctionType removed, because no longer needed
Diffstat (limited to 'engines/sci/sound/midiparser_sci.cpp')
| -rw-r--r-- | engines/sci/sound/midiparser_sci.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp index 9f0d8d150f..21f95f17e0 100644 --- a/engines/sci/sound/midiparser_sci.cpp +++ b/engines/sci/sound/midiparser_sci.cpp @@ -717,7 +717,7 @@ bool MidiParser_SCI::processEvent(const EventInfo &info, bool fireEvents) { break; case SCI_VERSION_1_EARLY: case SCI_VERSION_1_LATE: - case SCI_VERSION_2_1: + case SCI_VERSION_2_1_EARLY: inc = 1; break; default: @@ -862,7 +862,7 @@ void MidiParser_SCI::setMasterVolume(byte masterVolume) { case SCI_VERSION_1_EARLY: case SCI_VERSION_1_LATE: - case SCI_VERSION_2_1: + case SCI_VERSION_2_1_EARLY: // directly set master volume (global volume is merged with channel volumes) ((MidiPlayer *)_driver)->setVolume(masterVolume); break; @@ -887,7 +887,7 @@ void MidiParser_SCI::setVolume(byte volume) { case SCI_VERSION_1_EARLY: case SCI_VERSION_1_LATE: - case SCI_VERSION_2_1: + case SCI_VERSION_2_1_EARLY: // Send previous channel volumes again to actually update the volume for (int i = 0; i < 15; i++) if (_channelRemap[i] != -1) |