diff options
| author | Matthew Stewart | 2018-07-17 20:49:59 -0400 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-08-09 08:37:30 +0200 |
| commit | 639c02b76f591fe17ee78b6a72da46c4782fd4d5 (patch) | |
| tree | d850a636fda0dbaf945a31c56660d3eedcdfab45 /engines/startrek/sound.cpp | |
| parent | 52cfe602712ad39174379d56e1b45b7121fefda6 (diff) | |
| download | scummvm-rg350-639c02b76f591fe17ee78b6a72da46c4782fd4d5.tar.gz scummvm-rg350-639c02b76f591fe17ee78b6a72da46c4782fd4d5.tar.bz2 scummvm-rg350-639c02b76f591fe17ee78b6a72da46c4782fd4d5.zip | |
STARTREK: Fix sound, support MT32.
Also jump to the first mission after the intro.
Diffstat (limited to 'engines/startrek/sound.cpp')
| -rw-r--r-- | engines/startrek/sound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/startrek/sound.cpp b/engines/startrek/sound.cpp index b07fc68892..3d141499d3 100644 --- a/engines/startrek/sound.cpp +++ b/engines/startrek/sound.cpp @@ -36,7 +36,7 @@ namespace StarTrek { Sound::Sound(StarTrekEngine *vm) : _vm(vm) { if (_vm->getPlatform() == Common::kPlatformDOS || _vm->getPlatform() == Common::kPlatformMacintosh) { - _midiDevice = MidiDriver::detectDevice(MDT_PCSPK|MDT_ADLIB|MDT_MIDI); + _midiDevice = MidiDriver::detectDevice(MDT_PCSPK | MDT_ADLIB | MDT_MIDI | MDT_PREFER_MT32); _midiDriver = MidiDriver::createMidi(_midiDevice); _midiDriver->open(); _midiDriver->setTimerCallback(this, Sound::midiDriverCallback); @@ -366,7 +366,7 @@ void Sound::clearMidiSlot(int slot) { // Static callback method void Sound::midiDriverCallback(void *data) { Sound *s = (Sound*)data; - for (int i = NUM_MIDI_SLOTS; i < NUM_MIDI_SLOTS; i++) + for (int i = 0; i < NUM_MIDI_SLOTS; i++) s->_midiSlots[i].midiParser->onTimer(); // TODO: put this somewhere other than the midi callback... |