[Scummvm-cvs-logs] CVS: scummvm/sky hufftext.cpp,1.2,1.3 text.cpp,1.47,1.48 text.h,1.23,1.24

[Robert G?ffringmann]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv18106/sky

Modified Files:
	hufftext.cpp text.cpp text.h 
Log Message:
added khalek's huffman tree for 0.0109

Index: hufftext.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/hufftext.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hufftext.cpp	6 Jul 2003 21:03:39 -0000	1.2
+++ hufftext.cpp	12 Jul 2003 15:21:33 -0000	1.3
@@ -21,6 +21,176 @@
 
 #include "text.h"
 
+const HuffTree SkyText::_huffTree_00109[] = {
+	{ 1, 22, 0 },
+	{ 2, 9, 0 },
+	{ 3, 6, 0 },
+	{ 4, 5, 0 },
+	{ 0, 0, 0x20 },
+	{ 0, 0, 0x65 },
+	{ 7, 8, 0 },
+	{ 0, 0, 0x74 },
+	{ 0, 0, 0x6F },
+	{ 10, 17, 0 },
+	{ 11, 14, 0 },
+	{ 12, 13, 0 },
+	{ 0, 0, 0x2E },
+	{ 0, 0, 0x61 },
+	{ 15, 16, 0 },
+	{ 0, 0, 0x00 },
+	{ 0, 0, 0x73 },
+	{ 18, 21, 0 },
+	{ 19, 20, 0 },
+	{ 0, 0, 0x6E },
+	{ 0, 0, 0x68 },
+	{ 0, 0, 0x69 },
+	{ 23, 46, 0 },
+	{ 24, 35, 0 },
+	{ 25, 30, 0 },
+	{ 26, 29, 0 },
+	{ 27, 28, 0 },
+	{ 0, 0, 0x45 },
+	{ 0, 0, 0x49 },
+	{ 0, 0, 0x72 },
+	{ 31, 34, 0 },
+	{ 32, 33, 0 },
+	{ 0, 0, 0x54 },
+	{ 0, 0, 0x75 },
+	{ 0, 0, 0x6D },
+	{ 36, 41, 0 },
+	{ 37, 40, 0 },
+	{ 38, 39, 0 },
+	{ 0, 0, 0x6C },
+	{ 0, 0, 0x79 },
+	{ 0, 0, 0x4F },
+	{ 42, 45, 0 },
+	{ 43, 44, 0 },
+	{ 0, 0, 0x41 },
+	{ 0, 0, 0x53 },
+	{ 0, 0, 0x4E },
+	{ 47, 66, 0 },
+	{ 48, 57, 0 },
+	{ 49, 54, 0 },
+	{ 50, 53, 0 },
+	{ 51, 52, 0 },
+	{ 0, 0, 0x52 },
+	{ 0, 0, 0x64 },
+	{ 0, 0, 0x27 },
+	{ 55, 56, 0 },
+	{ 0, 0, 0x44 },
+	{ 0, 0, 0x4C },
+	{ 58, 63, 0 },
+	{ 59, 62, 0 },
+	{ 60, 61, 0 },
+	{ 0, 0, 0x67 },
+	{ 0, 0, 0x43 },
+	{ 0, 0, 0x63 },
+	{ 64, 65, 0 },
+	{ 0, 0, 0x48 },
+	{ 0, 0, 0x21 },
+	{ 67, 84, 0 },
+	{ 68, 77, 0 },
+	{ 69, 74, 0 },
+	{ 70, 73, 0 },
+	{ 71, 72, 0 },
+	{ 0, 0, 0x55 },
+	{ 0, 0, 0x77 },
+	{ 0, 0, 0x66 },
+	{ 75, 76, 0 },
+	{ 0, 0, 0x50 },
+	{ 0, 0, 0x4D },
+	{ 78, 81, 0 },
+	{ 79, 80, 0 },
+	{ 0, 0, 0x62 },
+	{ 0, 0, 0x57 },
+	{ 82, 83, 0 },
+	{ 0, 0, 0x3F },
+	{ 0, 0, 0x47 },
+	{ 85, 94, 0 },
+	{ 86, 91, 0 },
+	{ 87, 90, 0 },
+	{ 88, 89, 0 },
+	{ 0, 0, 0x59 },
+	{ 0, 0, 0x2C },
+	{ 0, 0, 0x70 },
+	{ 92, 93, 0 },
+	{ 0, 0, 0x42 },
+	{ 0, 0, 0x6B },
+	{ 95, 100, 0 },
+	{ 96, 99, 0 },
+	{ 97, 98, 0 },
+	{ 0, 0, 0x76 },
+	{ 0, 0, 0x46 },
+	{ 0, 0, 0x4B },
+	{ 101, 106, 0 },
+	{ 102, 105, 0 },
+	{ 103, 104, 0 },
+	{ 0, 0, 0x2D },
+	{ 0, 0, 0x56 },
+	{ 0, 0, 0x4A },
+	{ 107, 120, 0 },
+	{ 108, 113, 0 },
+	{ 109, 112, 0 },
+	{ 110, 111, 0 },
+	{ 0, 0, 0x3A },
+	{ 0, 0, 0x58 },
+	{ 0, 0, 0x6A },
+	{ 114, 117, 0 },
+	{ 115, 116, 0 },
+	{ 0, 0, 0x60 },
+	{ 0, 0, 0x5A },
+	{ 118, 119, 0 },
+	{ 0, 0, 0x78 },
+	{ 0, 0, 0x30 },
+	{ 121, 132, 0 },
+	{ 122, 127, 0 },
+	{ 123, 126, 0 },
+	{ 124, 125, 0 },
+	{ 0, 0, 0x32 },
+	{ 0, 0, 0x31 },
+	{ 0, 0, 0x51 },
+	{ 128, 131, 0 },
+	{ 129, 130, 0 },
+	{ 0, 0, 0x33 },
+	{ 0, 0, 0x39 },
+	{ 0, 0, 0x71 },
+	{ 133, 142, 0 },
+	{ 134, 137, 0 },
+	{ 135, 136, 0 },
+	{ 0, 0, 0x34 },
+	{ 0, 0, 0x38 },
+	{ 138, 141, 0 },
+	{ 139, 140, 0 },
+	{ 0, 0, 0x35 },
+	{ 0, 0, 0x7A },
+	{ 0, 0, 0x26 },
+	{ 143, 150, 0 },
+	{ 144, 147, 0 },
+	{ 145, 146, 0 },
+	{ 0, 0, 0x36 },
+	{ 0, 0, 0x29 },
+	{ 148, 149, 0 },
+	{ 0, 0, 0x28 },
+	{ 0, 0, 0x37 },
+	{ 151, 158, 0 },
+	{ 152, 155, 0 },
+	{ 153, 154, 0 },
+	{ 0, 0, 0x24 },
+	{ 0, 0, 0x22 },
+	{ 156, 157, 0 },
+	{ 0, 0, 0x2F },
+	{ 0, 0, 0x3C },
+	{ 159, 162, 0 },
+	{ 160, 161, 0 },
+	{ 0, 0, 0x3E },
+	{ 0, 0, 0x25 },
+	{ 163, 164, 0 },
+	{ 0, 0, 0x23 },
+	{ 165, 166, 0 },
+	{ 0, 0, 0x5F },
+	{ 0, 0, 0x7C }
+};
+
 const HuffTree SkyText::_huffTree_00267[] = {
 	{ 1, 20, 0 },
 	{ 2, 7, 0 },

Index: text.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- text.cpp	12 Jul 2003 10:02:12 -0000	1.47
+++ text.cpp	12 Jul 2003 15:21:34 -0000	1.48
@@ -430,6 +430,9 @@
 
 void SkyText::initHuffTree() {
 	switch (SkyState::_systemVars.gameVersion) {
+	case 109:
+		_huffTree = _huffTree_00109;
+		break;
 	case 267:
 		_huffTree = _huffTree_00267;
 		break;

Index: text.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- text.h	6 Jul 2003 21:03:39 -0000	1.23
+++ text.h	12 Jul 2003 15:21:34 -0000	1.24
@@ -86,7 +86,8 @@
 	bool	_dtCentre;	//set for centre text
 	uint32	_lowTextWidth, _mouseOfsX, _mouseOfsY;
 
-	static const HuffTree _huffTree_00267[]; // trees moved to hufftext.cpp
+	static const HuffTree _huffTree_00109[]; // trees moved to hufftext.cpp
+	static const HuffTree _huffTree_00267[];
 	static const HuffTree _huffTree_00288[];
 	static const HuffTree _huffTree_00303[];
 	static const HuffTree _huffTree_00331[];