[Scummvm-cvs-logs] CVS: scummvm/simon charset.cpp,1.15,1.16 items.cpp,1.91,1.92 simon.cpp,1.301,1.302

[Travis Howell]

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

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

Small correction for simon1/2 Hebrew


Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/charset.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- charset.cpp	3 Aug 2003 19:28:39 -0000	1.15
+++ charset.cpp	26 Sep 2003 05:34:52 -0000	1.16
@@ -215,11 +215,12 @@
 		video_fill_or_copy_from_3_to_2(fcs);
 	} else if (c == 0xD || c == 0xA) {
 		video_putchar_newline(fcs);
-	} else if (c == 8 || (_language != 20 && c == 1)) {
+	} else if ((c == 1 && _language != 20) || (c == 8)) {
 		if (_language == 20) { //Hebrew
+			if (c >= 64 && c < 91)
+				width = _hebrew_char_widths [c-64];
+
 			if (fcs->textLength != 0) {
-				if (c >= 64 && c < 91)
-					width = _hebrew_char_widths [c-64];
 				fcs->textLength--;			
 				fcs->textColumnOffset += width;
 				if (fcs->textColumnOffset >= 8) {
@@ -229,6 +230,7 @@
 			}
 		} else {
 			int8 val = (c == 8) ? 6 : 4;
+
 			if (fcs->textLength != 0) {
 				fcs->textLength--;
 				fcs->textColumnOffset -= val;
@@ -251,7 +253,7 @@
 				width = _hebrew_char_widths [c-64];
 			fcs->textColumnOffset  -= width;
 			if (fcs->textColumnOffset >= width) {
-				++fcs->textColumn;
+				fcs->textColumn++;
 				fcs->textColumnOffset += 8;
 			}
 			video_putchar_drawchar(fcs, fcs->width + fcs->x - fcs->textColumn, fcs->textRow * 8 + fcs->y, c);

Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- items.cpp	25 Sep 2003 04:23:07 -0000	1.91
+++ items.cpp	26 Sep 2003 05:34:52 -0000	1.92
@@ -1490,9 +1490,15 @@
 	old_text = fcs->text_color;
 	fcs->text_color = fcs->fill_color;
 
-	x += 120;
-	if (x != 128)
-		x = 129;
+	if (_language == 20) { //Hebrew
+		x = 128;
+	} else { 
+		x += 120;
+		if (x != 128)
+			x = 129;
+
+	}
+
 	video_putchar(fcs, x);
 
 	fcs->text_color = old_text;

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -d -r1.301 -r1.302
--- simon.cpp	25 Sep 2003 04:32:28 -0000	1.301
+++ simon.cpp	26 Sep 2003 05:34:52 -0000	1.302
@@ -2733,7 +2733,7 @@
 					width = _hebrew_char_widths [name[name_len]-64];
 				fcs->textLength++;
 				fcs->textColumnOffset -= width;
-				if (fcs->textColumnOffset >= width) {
+				if (fcs->textColumnOffset < width) {
 					fcs->textColumnOffset += 8;
 					fcs->textColumn++;
 				}