diff options
| author | Max Horn | 2003-12-24 00:25:18 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-24 00:25:18 +0000 |
| commit | e9269257f3da947eca3fb167b279fbe91650157a (patch) | |
| tree | 62784e4ce6a708398f018855b6d672de6b0345db /simon | |
| parent | 3f77642948a824e6e198c93a455fbf3fbab7e507 (diff) | |
| download | scummvm-rg350-e9269257f3da947eca3fb167b279fbe91650157a.tar.gz scummvm-rg350-e9269257f3da947eca3fb167b279fbe91650157a.tar.bz2 scummvm-rg350-e9269257f3da947eca3fb167b279fbe91650157a.zip | |
turned PlayingSoundHandle into an 'opaque' (well not really :-) data type, mainly because people kept (accidentally and sometimes on purpose :-) misusing them
svn-id: r11881
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/simon.h | 1 | ||||
| -rw-r--r-- | simon/sound.cpp | 4 | ||||
| -rw-r--r-- | simon/vga.cpp | 4 |
3 files changed, 2 insertions, 7 deletions
diff --git a/simon/simon.h b/simon/simon.h index 081a28524e..28814501d8 100644 --- a/simon/simon.h +++ b/simon/simon.h @@ -26,7 +26,6 @@ #include "base/engine.h" #include "common/util.h" #include "simon/midi.h" -#include "sound/mixer.h" #include "simon/sound.h" class GameDetector; diff --git a/simon/sound.cpp b/simon/sound.cpp index d0f17b3f24..a82fd2bc68 100644 --- a/simon/sound.cpp +++ b/simon/sound.cpp @@ -262,10 +262,6 @@ SimonSound::SimonSound(const byte game, const GameSpecificSettings *gss, const C _last_voice_file = 0; _offsets = 0; - _voice_handle = 0; - _effects_handle = 0; - _ambient_handle = 0; - _voice_file = false; _ambient_playing = 0; diff --git a/simon/vga.cpp b/simon/vga.cpp index 86f8d88ae6..1f66a58e45 100644 --- a/simon/vga.cpp +++ b/simon/vga.cpp @@ -1615,7 +1615,7 @@ void SimonEngine::vc_59() { vc_kill_sprite(file, start); } while (++start != end); } else { - if (_sound->_voice_handle == 0) + if (!_sound->_voice_handle.isActive()) vc_skip_next_instruction(); } } @@ -1798,7 +1798,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.isActive()) vc_skip_next_instruction(); } |