[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.258,1.259

Travis Howell kirben at users.sourceforge.net
Tue Jul 22 05:10:50 CEST 2003


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

Modified Files:
	simon.cpp 
Log Message:

Fix simon1talkie regression


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -d -r1.258 -r1.259
--- simon.cpp	21 Jul 2003 09:11:21 -0000	1.258
+++ simon.cpp	22 Jul 2003 12:09:56 -0000	1.259
@@ -2058,7 +2058,7 @@
 	case GAME_SIMON1CD32:
 		if (speech_id != 0)
 			talk_with_speech(speech_id, num_1);
-		if (string_ptr != NULL && _subtitles)
+		if ((speech_id == 0) || (string_ptr != NULL && _subtitles))
 			talk_with_text(num_1, num_2, (const char *)string_ptr, tv->a, tv->b, tv->c);
 		break;
 





More information about the Scummvm-git-logs mailing list