[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.19,1.20

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv11262/simon

Modified Files:
	simon.cpp 
Log Message:

There is no speech in simon2dos target


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- simon.cpp	22 Oct 2002 12:05:04 -0000	1.19
+++ simon.cpp	22 Oct 2002 13:50:20 -0000	1.20
@@ -50,7 +50,7 @@
 	"SIMON.GME",									/* gme_filename */
 	"SIMON.WAV",									/* wav_filename */
 	"SIMON.VOC",									/* wav_filename2 */
-	"EFFECTS.VOC",								/* effects_filename */
+	"EFFECTS.VOC",									/* effects_filename */
 	"GAMEPC",											/* gamepc_filename */
 };
 
@@ -86,7 +86,7 @@
 	1128 / 4,											/* MUSIC_INDEX_BASE */
 	1660 / 4,											/* SOUND_INDEX_BASE */
 	"SIMON2.GME",									/* gme_filename */
-	"SIMON2.WAV",									/* wav_filename */
+	NULL,										/* wav_filename */
 	NULL,
 	"",
 	"GAME32",											/* gamepc_filename */
@@ -1713,8 +1713,6 @@
 	case GAME_SIMON2DOS:
 		if (string_id != 0xFFFF)
 			string_ptr = getStringPtrByID(string_id);
-
-		speech_id = (uint16)getNextWord();
 		break;
 
 	case GAME_SIMON1DOS:
@@ -1767,18 +1765,8 @@
 		break;
 
 	case GAME_SIMON2DOS:
-		if (speech_id != 0 && num_1 == 1 && !_vk_t_toggle)
-			talk_with_speech(speech_id, num_1);
-
-		if (speech_id != 0 && !_vk_t_toggle)
-			return;
-
-		if (speech_id == 0)
-			o_unk_99_simon2(2, num_1 + 2);
-
 		talk_with_text(num_1, num_2, (char *)string_ptr, tv->a, tv->b, tv->c);
 		break;
-
 
 	case GAME_SIMON2WIN:
 		if (speech_id != 0 && num_1 == 1 && !_vk_t_toggle)