fix 0.0368 text decoding bug

svn-id: r8465

1 files changed, 251 insertions, 1 deletions

diff --git a/sky/text.cpp b/sky/text.cpp
index 865db43d80..1e22a39c4f 100644
--- a/sky/text.cpp
+++ b/sky/text.cpp
@@ -1234,7 +1234,7 @@ static const HuffTree huffTree_00331[] = {
 	{ 0, 0, (char)0x7c },
 };
 
-static const HuffTree huffTree_00372[] = {
+static const HuffTree huffTree_00368[] = {
 	{ 1, 20, 0 },
 	{ 2, 7, 0 },
 	{ 3, 4, 0 },
@@ -1382,6 +1382,254 @@ static const HuffTree huffTree_00372[] = {
 	{ 0, 0, 'x' },
 	{ 146, 149, 0 },
 	{ 147, 148, 0 },
+	{ 0, 0, 'X' },
+	{ 0, 0, 'X' },
+	{ 0, 0, (char)145 },
+	{ 151, 172, 0 },
+	{ 152, 163, 0 },
+	{ 153, 158, 0 },
+	{ 154, 157, 0 },
+	{ 155, 156, 0 },
+	{ 0, 0, (char)136 },
+	{ 0, 0, '`' },
+	{ 0, 0, '2' },
+	{ 159, 162, 0 },
+	{ 160, 161, 0 },
+	{ 0, 0, '0' },
+	{ 0, 0, (char)131 },
+	{ 0, 0, '1' },
+	{ 164, 169, 0 },
+	{ 165, 168, 0 },
+	{ 166, 167, 0 },
+	{ 0, 0, '/' },
+	{ 0, 0, '(' },
+	{ 0, 0, '=' },
+	{ 170, 171, 0 },
+	{ 0, 0, (char)134 },
+	{ 0, 0, '^' },
+	{ 173, 190, 0 },
+	{ 174, 181, 0 },
+	{ 175, 178, 0 },
+	{ 176, 177, 0 },
+	{ 0, 0, '3' },
+	{ 0, 0, '9' },
+	{ 179, 180, 0 },
+	{ 0, 0, (char)152 },
+	{ 0, 0, '4' },
+	{ 182, 187, 0 },
+	{ 183, 186, 0 },
+	{ 184, 185, 0 },
+	{ 0, 0, '}' },
+	{ 0, 0, '8' },
+	{ 0, 0, '\\' },
+	{ 188, 189, 0 },
+	{ 0, 0, '"' },
+	{ 0, 0, (char)144 },
+	{ 191, 206, 0 },
+	{ 192, 199, 0 },
+	{ 193, 196, 0 },
+	{ 194, 195, 0 },
+	{ 0, 0, '&' },
+	{ 0, 0, (char)141 },
+	{ 197, 198, 0 },
+	{ 0, 0, '5' },
+	{ 0, 0, '6' },
+	{ 200, 203, 0 },
+	{ 201, 202, 0 },
+	{ 0, 0, (char)146 },
+	{ 0, 0, (char)143 },
+	{ 204, 205, 0 },
+	{ 0, 0, (char)142 },
+	{ 0, 0, (char)147 },
+	{ 207, 220, 0 },
+	{ 208, 213, 0 },
+	{ 209, 212, 0 },
+	{ 210, 211, 0 },
+	{ 0, 0, (char)140 },
+	{ 0, 0, '7' },
+	{ 0, 0, (char)128 },
+	{ 214, 217, 0 },
+	{ 215, 216, 0 },
+	{ 0, 0, (char)129 },
+	{ 0, 0, (char)153 },
+	{ 218, 219, 0 },
+	{ 0, 0, '$' },
+	{ 0, 0, '@' },
+	{ 221, 230, 0 },
+	{ 222, 227, 0 },
+	{ 223, 226, 0 },
+	{ 224, 225, 0 },
+	{ 0, 0, '[' },
+	{ 0, 0, (char)154 },
+	{ 0, 0, '_' },
+	{ 228, 229, 0 },
+	{ 0, 0, '>' },
+	{ 0, 0, (char)150 },
+	{ 231, 236, 0 },
+	{ 232, 235, 0 },
+	{ 233, 234, 0 },
+	{ 0, 0, (char)130 },
+	{ 0, 0, '%' },
+	{ 0, 0, (char)9 },
+	{ 237, 240, 0 },
+	{ 238, 239, 0 },
+	{ 0, 0, (char)156 },
+	{ 0, 0, (char)151 },
+	{ 241, 242, 0 },
+	{ 0, 0, '{' },
+	{ 243, 244, 0 },
+	{ 0, 0, (char)148 },
+	{ 0, 0, '!' },
+};
+
+static const HuffTree huffTree_00372[] = {
+	{ 1, 20, 0 },
+	{ 2, 7, 0 },
+	{ 3, 4, 0 },
+	{ 0, 0, ' ' },
+	{ 5, 6, 0 },
+	{ 0, 0, 'e' },
+	{ 0, 0, 'a' },
+	{ 8, 15, 0 },
+	{ 9, 12, 0 },
+	{ 10, 11, 0 },
+	{ 0, 0, 'o' },
+	{ 0, 0, 's' },
+	{ 13, 14, 0 },
+	{ 0, 0, 't' },
+	{ 0, 0, 'n' },
+	{ 16, 19, 0 },
+	{ 17, 18, 0 },
+	{ 0, 0, '.' },
+	{ 0, 0, 'i' },
+	{ 0, 0, 'r' },
+	{ 21, 44, 0 },
+	{ 22, 31, 0 },
+	{ 23, 28, 0 },
+	{ 24, 27, 0 },
+	{ 25, 26, 0 },
+	{ 0, 0, (char)0 },
+	{ 0, 0, 'E' },
+	{ 0, 0, 'u' },
+	{ 29, 30, 0 },
+	{ 0, 0, 'm' },
+	{ 0, 0, 'A' },
+	{ 32, 39, 0 },
+	{ 33, 36, 0 },
+	{ 34, 35, 0 },
+	{ 0, 0, 'l' },
+	{ 0, 0, 'I' },
+	{ 37, 38, 0 },
+	{ 0, 0, 'd' },
+	{ 0, 0, 'R' },
+	{ 40, 43, 0 },
+	{ 41, 42, 0 },
+	{ 0, 0, 'N' },
+	{ 0, 0, 'S' },
+	{ 0, 0, 'T' },
+	{ 45, 68, 0 },
+	{ 46, 55, 0 },
+	{ 47, 52, 0 },
+	{ 48, 51, 0 },
+	{ 49, 50, 0 },
+	{ 0, 0, 'O' },
+	{ 0, 0, 'h' },
+	{ 0, 0, 'c' },
+	{ 53, 54, 0 },
+	{ 0, 0, 'D' },
+	{ 0, 0, 'g' },
+	{ 56, 63, 0 },
+	{ 57, 60, 0 },
+	{ 58, 59, 0 },
+	{ 0, 0, 'L' },
+	{ 0, 0, 'C' },
+	{ 61, 62, 0 },
+	{ 0, 0, 'p' },
+	{ 0, 0, 'U' },
+	{ 64, 67, 0 },
+	{ 65, 66, 0 },
+	{ 0, 0, '!' },
+	{ 0, 0, 'y' },
+	{ 0, 0, 'M' },
+	{ 69, 88, 0 },
+	{ 70, 79, 0 },
+	{ 71, 76, 0 },
+	{ 72, 75, 0 },
+	{ 73, 74, 0 },
+	{ 0, 0, 'P' },
+	{ 0, 0, 'v' },
+	{ 0, 0, 'H' },
+	{ 77, 78, 0 },
+	{ 0, 0, '?' },
+	{ 0, 0, 'b' },
+	{ 80, 85, 0 },
+	{ 81, 84, 0 },
+	{ 82, 83, 0 },
+	{ 0, 0, (char)39 },
+	{ 0, 0, 'f' },
+	{ 0, 0, ',' },
+	{ 86, 87, 0 },
+	{ 0, 0, 'G' },
+	{ 0, 0, 'B' },
+	{ 89, 108, 0 },
+	{ 90, 99, 0 },
+	{ 91, 96, 0 },
+	{ 92, 95, 0 },
+	{ 93, 94, 0 },
+	{ 0, 0, 'V' },
+	{ 0, 0, 'k' },
+	{ 0, 0, 'F' },
+	{ 97, 98, 0 },
+	{ 0, 0, 'q' },
+	{ 0, 0, 'w' },
+	{ 100, 105, 0 },
+	{ 101, 104, 0 },
+	{ 102, 103, 0 },
+	{ 0, 0, 'K' },
+	{ 0, 0, '-' },
+	{ 0, 0, 'W' },
+	{ 106, 107, 0 },
+	{ 0, 0, 'J' },
+	{ 0, 0, '*' },
+	{ 109, 128, 0 },
+	{ 110, 117, 0 },
+	{ 111, 114, 0 },
+	{ 112, 113, 0 },
+	{ 0, 0, 'z' },
+	{ 0, 0, 'Y' },
+	{ 115, 116, 0 },
+	{ 0, 0, 'j' },
+	{ 0, 0, '+' },
+	{ 118, 123, 0 },
+	{ 119, 122, 0 },
+	{ 120, 121, 0 },
+	{ 0, 0, 'Q' },
+	{ 0, 0, (char)133 },
+	{ 0, 0, ')' },
+	{ 124, 127, 0 },
+	{ 125, 126, 0 },
+	{ 0, 0, 'Z' },
+	{ 0, 0, (char)139 },
+	{ 0, 0, '<' },
+	{ 129, 150, 0 },
+	{ 130, 139, 0 },
+	{ 131, 136, 0 },
+	{ 132, 135, 0 },
+	{ 133, 134, 0 },
+	{ 0, 0, (char)149 },
+	{ 0, 0, (char)126 },
+	{ 0, 0, (char)138 },
+	{ 137, 138, 0 },
+	{ 0, 0, (char)135 },
+	{ 0, 0, ':' },
+	{ 140, 145, 0 },
+	{ 141, 144, 0 },
+	{ 142, 143, 0 },
+	{ 0, 0, (char)127 },
+	{ 0, 0, ']' },
+	{ 0, 0, '#' },
+	{ 146, 149, 0 },
+	{ 147, 148, 0 },
 	{ 0, 0, 'x' },
 	{ 0, 0, 'X' },
 	{ 0, 0, (char)145 },
@@ -1498,6 +1746,8 @@ void SkyText::initHuffTree() {
 		break;
 	case 365:
 	case 368:
+		_huffTree = huffTree_00368;
+		break;
 	case 372:
 		_huffTree = huffTree_00372;
 		break;