diff options
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/imuse.cpp | 4 | ||||
| -rw-r--r-- | sound/mididrv.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sound/imuse.cpp b/sound/imuse.cpp index 7a08fa7b21..73739eeae8 100644 --- a/sound/imuse.cpp +++ b/sound/imuse.cpp @@ -782,11 +782,13 @@ byte *IMuse::findTag(int sound, char *tag, int index) ptr += 4; pos = 0; + while (pos < size) { if (!memcmp(ptr + pos, tag, 4) && !index--) return ptr + pos + 8; pos += READ_BE_UINT32_UNALIGNED(ptr + pos + 4) + 8; } + debug(1, "IMuse::findTag failed finding sound %d", sound); return NULL; @@ -1627,7 +1629,7 @@ int IMuse::initialize(OSystem *syst, MidiDriver *midi, SoundMixer *mixer) _driver = driv; _hardware_type = driv->get_hardware_type(); _game_tempo = driv->get_base_tempo(); - + driv->init(this,syst); _master_volume = 127; diff --git a/sound/mididrv.cpp b/sound/mididrv.cpp index 8030bd28e0..ff1e305f9e 100644 --- a/sound/mididrv.cpp +++ b/sound/mididrv.cpp @@ -91,7 +91,7 @@ void CALLBACK MidiDriver_WIN::midi_callback(HMIDIOUT hmo, UINT wMsg, } } -int MidiDriver_WIN::open(int mode) { +int MidiDriver_WIN::open(int mode) { if (_mode != 0) return MERR_ALREADY_OPEN; |