libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 23:01:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed Simon 2 intro regression (and possibly others as well) caused by

Browse Source 
recent mixer change.

svn-id: r9926
This commit is contained in:
Torbjörn Andersson 2003-08-30 20:14:30 +00:00
parent bfee72f757
commit e7bebcf7aa
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
simon/sound.cpp
View File

@ -270,9 +270,9 @@ SimonSound::SimonSound(const byte game, const GameSpecificSettings *gss, const c
_filenums = 0;
_offsets = 0;
_voice_handle = 0;
_effects_handle = 0;
_ambient_handle = 0;
_voice_handle = -1;
_effects_handle = -1;
_ambient_handle = -1;
_voice_file = false;
_ambient_playing = 0;
@ -440,7 +440,7 @@ void SimonSound::playVoice(uint sound) {
if (!_voice)
return;
if (_voice_handle)
if (_voice_handle != -1)
_mixer->stop(_voice_index);
_voice_index = _voice->playSound(sound, &_voice_handle, (_game == GAME_SIMON1CD32) ? 0 : SoundMixer::FLAG_UNSIGNED);
@ -468,7 +468,7 @@ void SimonSound::playAmbient(uint sound) {
if (_ambient_paused)
return;
if (_ambient_handle)
if (_ambient_handle != -1)
_mixer->stop(_ambient_index);
_ambient_index = _effects->playSound(sound, &_ambient_handle, SoundMixer::FLAG_LOOP|SoundMixer::FLAG_UNSIGNED);

4
simon/vga.cpp
View File

@ -1597,7 +1597,7 @@ void SimonEngine::vc_59() {
vc_kill_sprite(file, start);
} while (++start != end);
} else {
if (_sound->_voice_handle == 0)
if (_sound->_voice_handle == -1)
vc_skip_next_instruction();
}
}
@ -1775,7 +1775,7 @@ void SimonEngine::vc_63_palette_thing_2() {
void SimonEngine::vc_64_skip_if_no_speech() {
// Simon2
if (_sound->_voice_handle == 0)
if (_sound->_voice_handle == -1)
vc_skip_next_instruction();
}