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

[Travis Howell]

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

Modified Files:
	simon.cpp 
Log Message:

That last change wasn't quite right


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