aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2003-05-20 15:17:21 +0000
committerMax Horn2003-05-20 15:17:21 +0000
commit22320e8271b99ffb9d7187b52c0c57b554e56d38 (patch)
tree84f177e637c0d3361cbce7770ef50f08718219de
parent684cd9c4318dcf6b101cbe68b2b1dbecfb52c1db (diff)
downloadscummvm-rg350-22320e8271b99ffb9d7187b52c0c57b554e56d38.tar.gz
scummvm-rg350-22320e8271b99ffb9d7187b52c0c57b554e56d38.tar.bz2
scummvm-rg350-22320e8271b99ffb9d7187b52c0c57b554e56d38.zip
init SimonSound members
svn-id: r7736
-rw-r--r--simon/sound.cpp12
-rw-r--r--simon/sound.h3
2 files changed, 12 insertions, 3 deletions
diff --git a/simon/sound.cpp b/simon/sound.cpp
index c90dddbca4..df27b1d0b0 100644
--- a/simon/sound.cpp
+++ b/simon/sound.cpp
@@ -27,16 +27,24 @@ SimonSound::SimonSound(const byte game, const GameSpecificSettings *gss, const c
_gameDataPath = gameDataPath;
_mixer = mixer;
+ _voice_index = 0;
+ _ambient_index = 0;
+
+ _voice = 0;
+ _effects = 0;
+
_effects_paused = false;
_ambient_paused = false;
+ _filenums = 0;
+ _offsets = 0;
+
_voice_handle = 0;
_effects_handle = 0;
_ambient_handle = 0;
- _ambient_playing = 0;
-
_voice_file = false;
+ _ambient_playing = 0;
File *file = new File();
File *file2 = new File();
diff --git a/simon/sound.h b/simon/sound.h
index 267e521094..b9d2a20d74 100644
--- a/simon/sound.h
+++ b/simon/sound.h
@@ -56,9 +56,10 @@ private:
byte _game;
const char *_gameDataPath;
+ SoundMixer *_mixer;
+
int _voice_index;
int _ambient_index;
- SoundMixer *_mixer;
Sound *_voice;
Sound *_effects;