[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.93,1.94 simonsound.cpp,1.1,1.2 simonsound.h,1.1,1.2

[Oliver Kiehl]

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

Modified Files:
	simon.cpp simonsound.cpp simonsound.h 
Log Message:
fixed last commit


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- simon.cpp	24 Nov 2002 13:05:44 -0000	1.93
+++ simon.cpp	24 Nov 2002 13:21:31 -0000	1.94
@@ -4485,10 +4485,10 @@
 	_mainscript_toggle = false;
 	_vgascript_toggle = false;
 
-	if (!_voice) {
-		_vk_t_toggle = true;
-	} else {
+	if (_sound->hasVoice()) {
 		_vk_t_toggle = false;
+	} else {
+		_vk_t_toggle = true;
 	}
 
 	while (1) {

Index: simonsound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simonsound.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- simonsound.cpp	24 Nov 2002 12:53:01 -0000	1.1
+++ simonsound.cpp	24 Nov 2002 13:21:31 -0000	1.2
@@ -148,6 +148,11 @@
 	_ambient_index = _effects->playSound(sound, &_ambient_handle, SoundMixer::FLAG_LOOP);
 }
 
+bool SimonSound::hasVoice()
+{
+	return _voice != NULL;
+}
+
 void SimonSound::stopAll()
 {
 	_mixer->stopAll();

Index: simonsound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simonsound.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- simonsound.h	24 Nov 2002 12:53:01 -0000	1.1
+++ simonsound.h	24 Nov 2002 13:21:31 -0000	1.2
@@ -67,6 +67,7 @@
 	void playEffects(uint sound);
 	void playAmbient(uint sound);
 
+	bool hasVoice();
 	void stopAll();
 	void effectsPause(bool b);
 	void ambientPause(bool b);