[Scummvm-cvs-logs] CVS: scummvm/simon charset.cpp,1.13,1.14 simon.cpp,1.274,1.275

[Travis Howell]

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

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

Hebrew support for load/save dialog


Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/charset.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- charset.cpp	2 Aug 2003 07:00:57 -0000	1.13
+++ charset.cpp	2 Aug 2003 07:10:30 -0000	1.14
@@ -244,7 +244,6 @@
 		if (_language == 20) { //Hebrew
 			if (c >= 64 && c < 91)
 				width = _hebrew_char_widths [c-64];
-
 			fcs->textColumnOffset  -= width;
 			if (fcs->textColumnOffset >= width) {
 				++fcs->textColumn;

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -d -r1.274 -r1.275
--- simon.cpp	2 Aug 2003 07:00:57 -0000	1.274
+++ simon.cpp	2 Aug 2003 07:10:30 -0000	1.275
@@ -2676,15 +2676,27 @@
 		// now process entire savegame name to get correct x offset for cursor
 		name_len = 0;
 		while (name[name_len]) {
-			fcs->textLength++;
-			fcs->textColumnOffset += 6;
-			if (name[name_len] == 'i' || name[name_len] == 'l')
-				fcs->textColumnOffset -= 2;
-			if (fcs->textColumnOffset >= 8) {
-				fcs->textColumnOffset -= 8;
-				fcs->textColumn++;
+			if (_language == 20) {
+				byte width = 6;
+				if (name[name_len] >= 64 && name[name_len] < 91)
+					width = _hebrew_char_widths [name[name_len]-64];
+				fcs->textLength++;
+				fcs->textColumnOffset -= width;
+				if (fcs->textColumnOffset >= width) {
+					fcs->textColumnOffset += 8;
+					fcs->textColumn++;
+				}
+			} else {
+				fcs->textLength++;
+				fcs->textColumnOffset += 6;
+				if (name[name_len] == 'i' || name[name_len] == 'l')
+					fcs->textColumnOffset -= 2;
+				if (fcs->textColumnOffset >= 8) {
+					fcs->textColumnOffset -= 8;
+					fcs->textColumn++;
+				}
+				name_len++;
 			}
-			name_len++;
 		}
 		// while_1_end