[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.260,1.261 sound.cpp,1.32,1.33

[Travis Howell]

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

Modified Files:
	simon.cpp sound.cpp 
Log Message:

Simon games shold only play one voice at a time.
Fixes many voice overlaps
Fixes subtitles been ot of sync with voice, with simon 1 versions that had combi
ned speech/subtitles.



Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -d -r1.260 -r1.261
--- simon.cpp	22 Jul 2003 12:16:56 -0000	1.260
+++ simon.cpp	24 Jul 2003 14:21:55 -0000	1.261
@@ -2389,8 +2389,7 @@
 		_vga_tick_counter++;
 
 		while (vte->delay) {
-			// not quite ok, good enough
-			if ((int16)(vte->delay -= 5) <= 0) {
+			if (!--vte->delay) {
 				uint16 cur_file = vte->cur_vga_file;
 				uint16 cur_unk = vte->sprite_id;
 				byte *script_ptr = vte->script_pointer;
@@ -2399,8 +2398,6 @@
 				delete_vga_timer(vte);
 
 				if (script_ptr == NULL) {
-					// special scroll timer
-					scroll_timeout();
 				} else {
 					vc_resume_sprite(script_ptr, cur_file, cur_unk);
 				}

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- sound.cpp	24 Jul 2003 12:32:56 -0000	1.32
+++ sound.cpp	24 Jul 2003 14:21:56 -0000	1.33
@@ -450,6 +450,9 @@
 	if (!_voice)
 		return;
 
+	if (_voice)
+		_mixer->stop(_voice_index);
+
 	if (_game == GAME_SIMON1CD32)
 		_voice_index = _voice->playSound(sound, &_voice_handle, FLAG_SIGNED);
 	else