[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.277,1.278

Travis Howell kirben at users.sourceforge.net
Sat Aug 2 03:43:02 CEST 2003


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

Modified Files:
	simon.cpp 
Log Message:

My last commit caused regression


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -d -r1.277 -r1.278
--- simon.cpp	2 Aug 2003 10:15:07 -0000	1.277
+++ simon.cpp	2 Aug 2003 10:42:54 -0000	1.278
@@ -2085,7 +2085,7 @@
 		if ((_game & GF_TALKIE) && (speech_id == 0))
 			o_kill_sprite_simon2(2, num_1 + 2);
 
-		if (_subtitles)
+		if (_subtitles || speech_id == 0)
 			talk_with_text(num_1, num_2, (const char *)string_ptr, tv->a, tv->b, tv->c);
 		break;
 	}
@@ -2657,7 +2657,7 @@
 
 		fcs->textRow = unk132_result;
 
-		if (_language == 20) {
+		if (_language == 20) { //Hebrew
 			// init x offset with a 2 character savegame number + a period (18 pix)
 			fcs->textColumn = 3;
 			fcs->textColumnOffset = 6;
@@ -2674,7 +2674,7 @@
 		// now process entire savegame name to get correct x offset for cursor
 		name_len = 0;
 		while (name[name_len]) {
-			if (_language == 20) {
+			if (_language == 20) { //Hebrew
 				byte width = 6;
 				if (name[name_len] >= 64 && name[name_len] < 91)
 					width = _hebrew_char_widths [name[name_len]-64];





More information about the Scummvm-git-logs mailing list