TONY: Correct some initialisation of the character arrays

author: Paul Gilbert 2012-05-05 09:38:22 +1000
committer: Paul Gilbert 2012-05-05 09:38:22 +1000
commit: 0b249c042f8c3f70188d3ce97516fe1290c30504 (patch)
tree: 54b0a804a4b53e68860b8007d7bc107c9c4ac08d /engines/tony/font.cpp
parent: 657d93ea8f5e123024c4618b8a3dc441a9f45cbc (diff)
download: scummvm-rg350-0b249c042f8c3f70188d3ce97516fe1290c30504.tar.gz
scummvm-rg350-0b249c042f8c3f70188d3ce97516fe1290c30504.tar.bz2
scummvm-rg350-0b249c042f8c3f70188d3ce97516fe1290c30504.zip
1 files changed, 162 insertions, 162 deletions
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
author	Paul Gilbert	2012-05-05 09:38:22 +1000
committer	Paul Gilbert	2012-05-05 09:38:22 +1000
commit	0b249c042f8c3f70188d3ce97516fe1290c30504 (patch)
tree	54b0a804a4b53e68860b8007d7bc107c9c4ac08d /engines/tony/font.cpp
parent	657d93ea8f5e123024c4618b8a3dc441a9f45cbc (diff)
download	scummvm-rg350-0b249c042f8c3f70188d3ce97516fe1290c30504.tar.gz scummvm-rg350-0b249c042f8c3f70188d3ce97516fe1290c30504.tar.bz2 scummvm-rg350-0b249c042f8c3f70188d3ce97516fe1290c30504.zip