[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.89,1.90 simon.cpp,1.275,1.276

Travis Howell kirben at users.sourceforge.net
Sat Aug 2 03:10:01 CEST 2003


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

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

Add combined speech/subtitles support for simon2 hebrew


Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- items.cpp	27 Jul 2003 12:05:08 -0000	1.89
+++ items.cpp	2 Aug 2003 10:09:05 -0000	1.90
@@ -1000,9 +1000,9 @@
 					d = _array_4[a];
 
 				if (_game & GF_SIMON2) {
-					if (d != 0 && !_subtitles)
+					if (d != 0 && (_language == 20 || !_subtitles))
 						talk_with_speech(d, b);
-					else if (s != NULL)
+					if (s != NULL && _subtitles)
 						talk_with_text(b, c, s, tv->a, tv->b, tv->c);
 				} else {
 					if (d != 0)
@@ -1304,7 +1304,7 @@
 				}
 			}
 
-			if (!_subtitles)
+			if (_language == 20 || !_subtitles)
 				talk_with_speech(var200, a);
 		}
 

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -d -r1.275 -r1.276
--- simon.cpp	2 Aug 2003 07:10:30 -0000	1.275
+++ simon.cpp	2 Aug 2003 10:09:05 -0000	1.276
@@ -2079,16 +2079,14 @@
 	case GAME_SIMON2TALKIE:
 	case GAME_SIMON2WIN:
 	case GAME_SIMON2MAC:
-		if (speech_id != 0 && num_1 == 1 && !_subtitles)
+		if (speech_id != 0 && num_1 == 1 && (_language == 20 || !_subtitles))
 			talk_with_speech(speech_id, num_1);
 
-		if (speech_id != 0 && !_subtitles)
-			return;
-
 		if ((_game & GF_TALKIE) && (speech_id == 0))
 			o_kill_sprite_simon2(2, num_1 + 2);
 
-		talk_with_text(num_1, num_2, (const char *)string_ptr, tv->a, tv->b, tv->c);
+		if (_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