[Scummvm-cvs-logs] CVS: scummvm/simon sound.cpp,1.15,1.16 sound.h,1.5,1.6

[Max Horn]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv30465

Modified Files:
	sound.cpp sound.h 
Log Message:
init SimonSound members

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- sound.cpp	25 Mar 2003 12:25:06 -0000	1.15
+++ sound.cpp	20 May 2003 15:17:21 -0000	1.16
@@ -27,16 +27,24 @@
 	_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();

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sound.h	6 Mar 2003 21:46:52 -0000	1.5
+++ sound.h	20 May 2003 15:17:21 -0000	1.6
@@ -56,9 +56,10 @@
 	byte _game;
 	const char *_gameDataPath;
 
+	SoundMixer *_mixer;
+
 	int _voice_index;
 	int _ambient_index;
-	SoundMixer *_mixer;
 
 	Sound *_voice;
 	Sound *_effects;