diff options
| author | Torbjörn Andersson | 2003-08-30 20:35:07 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2003-08-30 20:35:07 +0000 |
| commit | dfe5d067bb0f2d21c598a297a263b444e925600d (patch) | |
| tree | 39be5476ae41ce1a8aeb2cd7bb369b0ff61a319d /simon | |
| parent | b321a7a4689dcd96b80566f19c628cfcef0ff24c (diff) | |
| download | scummvm-rg350-dfe5d067bb0f2d21c598a297a263b444e925600d.tar.gz scummvm-rg350-dfe5d067bb0f2d21c598a297a263b444e925600d.tar.bz2 scummvm-rg350-dfe5d067bb0f2d21c598a297a263b444e925600d.zip | |
Reverted previous change since the mixer change was reverted.
svn-id: r9929
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/sound.cpp | 10 | ||||
| -rw-r--r-- | simon/vga.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/simon/sound.cpp b/simon/sound.cpp index c9381d66bd..2aca4b955c 100644 --- a/simon/sound.cpp +++ b/simon/sound.cpp @@ -270,9 +270,9 @@ SimonSound::SimonSound(const byte game, const GameSpecificSettings *gss, const c _filenums = 0; _offsets = 0; - _voice_handle = -1; - _effects_handle = -1; - _ambient_handle = -1; + _voice_handle = 0; + _effects_handle = 0; + _ambient_handle = 0; _voice_file = false; _ambient_playing = 0; @@ -440,7 +440,7 @@ void SimonSound::playVoice(uint sound) { if (!_voice) return; - if (_voice_handle != -1) + if (_voice_handle) _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 != -1) + if (_ambient_handle) _mixer->stop(_ambient_index); _ambient_index = _effects->playSound(sound, &_ambient_handle, SoundMixer::FLAG_LOOP|SoundMixer::FLAG_UNSIGNED); diff --git a/simon/vga.cpp b/simon/vga.cpp index e48db0c6c7..9d7fc54b4b 100644 --- a/simon/vga.cpp +++ b/simon/vga.cpp @@ -1597,7 +1597,7 @@ void SimonEngine::vc_59() { vc_kill_sprite(file, start); } while (++start != end); } else { - if (_sound->_voice_handle == -1) + if (_sound->_voice_handle == 0) 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 == -1) + if (_sound->_voice_handle == 0) vc_skip_next_instruction(); } |