From 0b249c042f8c3f70188d3ce97516fe1290c30504 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 5 May 2012 09:38:22 +1000
Subject: TONY: Correct some initialisation of the character arrays

---
 engines/tony/font.cpp | 324 +++++++++++++++++++++++++-------------------------
 1 file changed, 162 insertions(+), 162 deletions(-)

(limited to 'engines/tony/font.cpp')

diff --git a/engines/tony/font.cpp b/engines/tony/font.cpp
index c4f589a21d..f28d4f6eea 100644
--- a/engines/tony/font.cpp
+++ b/engines/tony/font.cpp
@@ -1534,37 +1534,37 @@ void RMFontObj::Init(void) {
 	cTable['='] = 49;
 	cTable['\''] = 50;
 	cTable['\"'] = 51;
-	cTable['�'] = 52;
-	cTable['$'] = 53;
-	cTable['%'] = 54;
-	cTable['&'] = 55;
-	cTable['^'] = 56;
-	cTable['*'] = 57;
-	cTable['<'] = 58;
-	cTable['>'] = 59;
-	cTable['�'] = 60;
-	cTable['�'] = 61;
-	cTable['�'] = 62;
-	cTable['�'] = 63;
-	//cTable['�'] = 64;   integrale
-	cTable['�'] = 65;
-	cTable['�'] = 66;
-	cTable['�'] = 67;
-	cTable['�'] = 68;
-	cTable['�'] = 69;
-	cTable['�'] = cTable['�'] = 70;
-	cTable['�'] = 71;
-	cTable['�'] = 72;
-	cTable['�'] = 73;
-	//cTable[' '] = 74;   e cerchietto
-	cTable['�'] = 75;
-	cTable['�'] = 76;
-	//cTable[' '] = 77;	  i cerchietto
-	cTable['�'] = 78;
-	cTable['�'] = cTable['�'] = 79;
-	//cTable[' '] = 80;		o cerchietto
-	cTable['�'] = 81;
-	cTable['�'] = cTable['�'] = 82;
+	cTable[(byte)'�'] = 52;
+	cTable[(byte)'$'] = 53;
+	cTable[(byte)'%'] = 54;
+	cTable[(byte)'&'] = 55;
+	cTable[(byte)'^'] = 56;
+	cTable[(byte)'*'] = 57;
+	cTable[(byte)'<'] = 58;
+	cTable[(byte)'>'] = 59;
+	cTable[(byte)'�'] = 60;
+	cTable[(byte)'�'] = 61;
+	cTable[(byte)'�'] = 62;
+	cTable[(byte)'�'] = 63;
+	//cTable[(byte)'�'] = 64;   integrale
+	cTable[(byte)'�'] = 65;
+	cTable[(byte)'�'] = 66;
+	cTable[(byte)'�'] = 67;
+	cTable[(byte)'�'] = 68;
+	cTable[(byte)'�'] = 69;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 70;
+	cTable[(byte)'�'] = 71;
+	cTable[(byte)'�'] = 72;
+	cTable[(byte)'�'] = 73;
+	//cTable[(byte)' '] = 74;   e cerchietto
+	cTable[(byte)'�'] = 75;
+	cTable[(byte)'�'] = 76;
+	//cTable[(byte)' '] = 77;	  i cerchietto
+	cTable[(byte)'�'] = 78;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 79;
+	//cTable[(byte)' '] = 80;		o cerchietto
+	cTable[(byte)'�'] = 81;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 82;
 	//cTable[' '] = 83;		u cerchietto
 	//cTable[' '] = 84;   y dieresi
 
@@ -1610,7 +1610,7 @@ void RMFontObj::Init(void) {
 	lTable['y'] = lTable['Y'] = 13;
 	lTable['w'] = lTable['W'] = 19;
 	lTable['z'] = lTable['Z'] = 20;
-	lTable['�'] = 17;
+	lTable[(byte)'�'] = 17;
 
 	/* Casi particolari */
 	SetBothCase('C','C',2);
@@ -1629,32 +1629,32 @@ void RMFontObj::Init(void) {
 	// Polish characters
 	//�����ꣳ���󌜯���
 	//AaCcEeLlNnOoSsZzZz
-	cTable['�'] = cTable['�'] = 85;
-	lTable['�'] = lTable['�'] = 20;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 85;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 20;
 
-	cTable['�'] = cTable['�'] = 86;
-	lTable['�'] = lTable['�'] = 22;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 86;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 22;
 	
-	cTable['�'] = cTable['�'] = 87;
-	lTable['�'] = lTable['�'] = 17;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 87;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 17;
 	
-	cTable['�'] = cTable['�'] = 88;
-	lTable['�'] = lTable['�'] = 19;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 88;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 19;
 
-	cTable['�'] = cTable['�'] = 89;
-	lTable['�'] = lTable['�'] = 17;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 89;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 17;
 
-	cTable['�'] = cTable['�'] = 90;
-	lTable['�'] = lTable['�'] = 22;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 90;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 22;
 
-	cTable['�'] = cTable['�'] = 91;
-	lTable['�'] = lTable['�'] = 15;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 91;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 15;
 
-	cTable['�'] = cTable['�'] = 92;
-	lTable['�'] = lTable['�'] = 21;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 92;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 21;
 
-	cTable['�'] = cTable['�'] = 93;
-	lTable['�'] = lTable['�'] = 21;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 93;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 21;
 
 
 #ifdef FONT_RUSSIAN
@@ -1663,114 +1663,114 @@ void RMFontObj::Init(void) {
 	// per le altre traduzioni. Per compilare Tony in altre lingue,
 	// commentare via queste definizioni.
 
-	cTable['�'] = cTable['�'] = 85;
-	lTable['�'] = lTable['�'] = 20;
-
-	cTable['�'] = cTable['�'] =94;
-	cTable['�'] = cTable['�'] =95;
-	cTable['�'] = cTable['�'] =96;
-	cTable['�'] = cTable['�'] =97;
-	cTable['�'] = cTable['�'] =98;
-	cTable['�'] = cTable['�'] =99;
-	cTable['�'] = cTable['�'] =100;
-	cTable['�'] = cTable['�'] =101;
-	cTable['�'] = cTable['�'] =102;
-	cTable['�'] = cTable['�'] =103;
-	cTable['�'] = cTable['�'] =104;
-	cTable['�'] = cTable['�'] =105;
-	cTable['�'] = cTable['�'] =106;
-	cTable['�'] = cTable['�'] =107;
-	cTable['�'] = cTable['�'] =108;
-	cTable['�'] = cTable['�'] =109;
-	cTable['�'] = cTable['�'] =110;
-	cTable['�'] = cTable['�'] =111;
-	cTable['�'] = cTable['�'] =112;
-	cTable['�'] = cTable['�'] =113;
-	cTable['�'] = cTable['�'] =114;
-	cTable['�'] = cTable['�'] =115;
-	cTable['�'] = cTable['�'] =116;
-	cTable['�'] = cTable['�'] =117;
-	cTable['�'] = cTable['�'] =118;
-	cTable['�'] = cTable['�'] =119;
-	cTable['�'] = cTable['�'] =120;
-	cTable['�'] = cTable['�'] =121;
-	cTable['�'] = cTable['�'] =122;
-	cTable['�'] = cTable['�'] =123;
-	cTable['�'] = cTable['�'] =124;
-	cTable['�'] = cTable['�'] =125;
-	cTable['�'] = cTable['�'] =126;
-
-
-	lTable['�'] = lTable['�'] = 18;
-	lTable['�'] = lTable['�'] = 18;
-	lTable['�'] = lTable['�'] = 18;
-	lTable['�'] = lTable['�'] = 17;
-	lTable['�'] = lTable['�'] = 16;
-	lTable['�'] = lTable['�'] = 18;
-	lTable['�'] = lTable['�'] = 18;
-	lTable['�'] = lTable['�'] = 20;
-	lTable['�'] = lTable['�'] = 18;
-	lTable['�'] = lTable['�'] = 18;
-	lTable['�'] = lTable['�'] = 18;
-	lTable['�'] = lTable['�'] = 18;
-	lTable['�'] = lTable['�'] = 16;
-	lTable['�'] = lTable['�'] = 18;
-	lTable['�'] = lTable['�'] = 15;
-	lTable['�'] = lTable['�'] = 22;
-	lTable['�'] = lTable['�'] = 15;
-	lTable['�'] = lTable['�'] = 18;
-	lTable['�'] = lTable['�'] = 22;
-	lTable['�'] = lTable['�'] = 19;
-	lTable['�'] = lTable['�'] = 16;
-	lTable['�'] = lTable['�'] = 21;
-	lTable['�'] = lTable['�'] = 20;
-	lTable['�'] = lTable['�'] = 16;
-	lTable['�'] = lTable['�'] = 16;
-	lTable['�'] = lTable['�'] = 19;
-	lTable['�'] = lTable['�'] = 22;
-	lTable['�'] = lTable['�'] = 18;
-	lTable['�'] = lTable['�'] = 19;	
-	lTable['�'] = lTable['�'] = 19;
-	lTable['�'] = lTable['�'] = 15;
-	lTable['�'] = lTable['�'] = 18;
-	lTable['�'] = lTable['�'] = 18;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 85;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 20;
+
+	cTable[(byte)'�'] = cTable[(byte)'�'] =94;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =95;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =96;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =97;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =98;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =99;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =100;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =101;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =102;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =103;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =104;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =105;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =106;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =107;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =108;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =109;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =110;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =111;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =112;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =113;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =114;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =115;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =116;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =117;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =118;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =119;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =120;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =121;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =122;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =123;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =124;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =125;
+	cTable[(byte)'�'] = cTable[(byte)'�'] =126;
+
+
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 18;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 18;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 18;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 17;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 16;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 18;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 18;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 20;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 18;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 18;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 18;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 18;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 16;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 18;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 15;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 22;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 15;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 18;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 22;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 19;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 16;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 21;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 20;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 16;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 16;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 19;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 22;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 18;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 19;	
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 19;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 15;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 18;
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 18;
 
 #endif // FONT_RUSSIAN
 
 #ifdef FONT_CZECH
 	// rep. ceca characters	
 
-	cTable['�'] = cTable['�'] = 127;
-	cTable['�'] = cTable['�'] = 128;
-	cTable['�'] = cTable['�'] = 129;
-	cTable['�'] = cTable['�'] = 130;
-	cTable['�'] = cTable['�'] = 131;
-	cTable['�'] = cTable['�'] = 132;
-	cTable['�'] = cTable['�'] = 133;
-	cTable['�'] = cTable['�'] = 134;
-	cTable['�'] = cTable['�'] = 135;
-	cTable['�'] = cTable['�'] = 136;
-	cTable['�'] = cTable['�'] = 137;
-	cTable['�'] = cTable['�'] = 138;
-	cTable['�'] = cTable['�'] = 139;
-	cTable['�'] = cTable['�'] = 140;
-	cTable['�'] = cTable['�'] = 141;
-
-	lTable['�'] = lTable['�'] =17;
-	lTable['�'] = lTable['�'] =15;
-	lTable['�'] = lTable['�'] =22;
-	lTable['�'] = lTable['�'] =18;
-	lTable['�'] = lTable['�'] =21;
-	lTable['�'] = lTable['�'] =16;
-	lTable['�'] = lTable['�'] =18;
-	lTable['�'] = lTable['�'] =19;
-	lTable['�'] = lTable['�'] =17;
-	lTable['�'] = lTable['�'] =23;
-	lTable['�'] = lTable['�'] =24;
-	lTable['�'] = lTable['�'] =17;
-	lTable['�'] = lTable['�'] =22;
-	lTable['�'] = lTable['�'] =16;
-	lTable['�'] = lTable['�'] =16;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 127;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 128;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 129;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 130;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 131;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 132;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 133;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 134;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 135;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 136;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 137;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 138;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 139;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 140;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 141;
+
+	lTable[(byte)'�'] = lTable[(byte)'�'] =17;
+	lTable[(byte)'�'] = lTable[(byte)'�'] =15;
+	lTable[(byte)'�'] = lTable[(byte)'�'] =22;
+	lTable[(byte)'�'] = lTable[(byte)'�'] =18;
+	lTable[(byte)'�'] = lTable[(byte)'�'] =21;
+	lTable[(byte)'�'] = lTable[(byte)'�'] =16;
+	lTable[(byte)'�'] = lTable[(byte)'�'] =18;
+	lTable[(byte)'�'] = lTable[(byte)'�'] =19;
+	lTable[(byte)'�'] = lTable[(byte)'�'] =17;
+	lTable[(byte)'�'] = lTable[(byte)'�'] =23;
+	lTable[(byte)'�'] = lTable[(byte)'�'] =24;
+	lTable[(byte)'�'] = lTable[(byte)'�'] =17;
+	lTable[(byte)'�'] = lTable[(byte)'�'] =22;
+	lTable[(byte)'�'] = lTable[(byte)'�'] =16;
+	lTable[(byte)'�'] = lTable[(byte)'�'] =16;
 
 #endif // FONT_CZECH
 
@@ -1778,20 +1778,20 @@ void RMFontObj::Init(void) {
 
 	// traduci le lettere accentate in lettere normali
 
-	cTable['�'] = cTable['�'] = cTable['�'] = 0; // a
-	lTable['�'] = lTable['�'] = lTable['�'] = 17;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = cTable[(byte)'�'] = 0; // a
+	lTable[(byte)'�'] = lTable[(byte)'�'] = lTable[(byte)'�'] = 17;
 
-	cTable['�'] = cTable['�'] = 4; // e
-	lTable['�'] = lTable['�'] = 15;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 4; // e
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 15;
 
-	cTable['�'] = cTable['�'] = cTable['�'] = 8; // i
-	lTable['�'] = lTable['�'] = lTable['�'] = 16;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = cTable[(byte)'�'] = 8; // i
+	lTable[(byte)'�'] = lTable[(byte)'�'] = lTable[(byte)'�'] = 16;
 
-	cTable['�'] = cTable['�'] = cTable['�'] = cTable['�'] = 14; // o
-	lTable['�'] = lTable['�'] = lTable['�'] = lTable['�'] = 19;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = cTable[(byte)'�'] = cTable[(byte)'�'] = 14; // o
+	lTable[(byte)'�'] = lTable[(byte)'�'] = lTable[(byte)'�'] = lTable[(byte)'�'] = 19;
 
-	cTable['�'] = cTable['�'] = 20; // u
-	lTable['�'] = lTable['�'] = 15;
+	cTable[(byte)'�'] = cTable[(byte)'�'] = 20; // u
+	lTable[(byte)'�'] = lTable[(byte)'�'] = 15;
 
 #endif // FONT_FRENCH
 
-- 
cgit v1.2.3