[Scummvm-cvs-logs] CVS: scummvm/sky hufftext.cpp,1.6,1.7 text.h,1.33,1.34

[Chris Apers]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27089

Modified Files:
	hufftext.cpp text.h 
Log Message:
Moved to a database to save memory on PalmOS

Index: hufftext.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/hufftext.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- hufftext.cpp	6 Jan 2004 12:45:32 -0000	1.6
+++ hufftext.cpp	20 Dec 2004 16:50:29 -0000	1.7
@@ -23,6 +23,17 @@
 
 namespace Sky {
 
+#ifdef __PALM_OS__
+const HuffTree *Text::_huffTree_00109;
+const HuffTree *Text::_huffTree_00267;
+const HuffTree *Text::_huffTree_00288;
+const HuffTree *Text::_huffTree_00303;
+const HuffTree *Text::_huffTree_00331;
+const HuffTree *Text::_huffTree_00348;
+const HuffTree *Text::_huffTree_00365;
+const HuffTree *Text::_huffTree_00368;
+const HuffTree *Text::_huffTree_00372;
+#else
 const HuffTree Text::_huffTree_00109[] = {
 	{ 1, 22, 0 },
 	{ 2, 9, 0 },
@@ -2000,5 +2011,35 @@
 	{ 0, 0, 148 },
 	{ 0, 0, '!' },
 };
+#endif
 
 } // End of namespace Sky
+
+#ifdef __PALM_OS__
+#include "scumm_globals.h"
+
+_GINIT(Sky_Hufftext)
+_GSETPTR(Sky::Text::_huffTree_00109, GBVARS_HUFFTREE_00109_INDEX, const Sky::HuffTree, GBVARS_QUEEN)
+_GSETPTR(Sky::Text::_huffTree_00267, GBVARS_HUFFTREE_00267_INDEX, const Sky::HuffTree, GBVARS_QUEEN)
+_GSETPTR(Sky::Text::_huffTree_00288, GBVARS_HUFFTREE_00288_INDEX, const Sky::HuffTree, GBVARS_QUEEN)
+_GSETPTR(Sky::Text::_huffTree_00303, GBVARS_HUFFTREE_00303_INDEX, const Sky::HuffTree, GBVARS_QUEEN)
+_GSETPTR(Sky::Text::_huffTree_00331, GBVARS_HUFFTREE_00331_INDEX, const Sky::HuffTree, GBVARS_QUEEN)
+_GSETPTR(Sky::Text::_huffTree_00348, GBVARS_HUFFTREE_00348_INDEX, const Sky::HuffTree, GBVARS_QUEEN)
+_GSETPTR(Sky::Text::_huffTree_00365, GBVARS_HUFFTREE_00365_INDEX, const Sky::HuffTree, GBVARS_QUEEN)
+_GSETPTR(Sky::Text::_huffTree_00368, GBVARS_HUFFTREE_00368_INDEX, const Sky::HuffTree, GBVARS_QUEEN)
+_GSETPTR(Sky::Text::_huffTree_00372, GBVARS_HUFFTREE_00372_INDEX, const Sky::HuffTree, GBVARS_QUEEN)
+_GEND
+
+_GRELEASE(Sky_Hufftext)
+_GRELEASEPTR(GBVARS_HUFFTREE_00109_INDEX, GBVARS_QUEEN)
+_GRELEASEPTR(GBVARS_HUFFTREE_00267_INDEX, GBVARS_QUEEN)
+_GRELEASEPTR(GBVARS_HUFFTREE_00288_INDEX, GBVARS_QUEEN)
+_GRELEASEPTR(GBVARS_HUFFTREE_00303_INDEX, GBVARS_QUEEN)
+_GRELEASEPTR(GBVARS_HUFFTREE_00331_INDEX, GBVARS_QUEEN)
+_GRELEASEPTR(GBVARS_HUFFTREE_00348_INDEX, GBVARS_QUEEN)
+_GRELEASEPTR(GBVARS_HUFFTREE_00365_INDEX, GBVARS_QUEEN)
+_GRELEASEPTR(GBVARS_HUFFTREE_00368_INDEX, GBVARS_QUEEN)
+_GRELEASEPTR(GBVARS_HUFFTREE_00372_INDEX, GBVARS_QUEEN)
+_GEND
+
+#endif

Index: text.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- text.h	15 Dec 2004 06:48:04 -0000	1.33
+++ text.h	20 Dec 2004 16:50:29 -0000	1.34
@@ -103,6 +103,7 @@
 	bool	_dtCentre;	//set for centre text
 	uint32	_lowTextWidth, _mouseOfsX, _mouseOfsY;
 
+#ifndef __PALM_OS__
 	static const HuffTree _huffTree_00109[]; // trees moved to hufftext.cpp
 	static const HuffTree _huffTree_00267[];
 	static const HuffTree _huffTree_00288[];
@@ -112,6 +113,19 @@
 	static const HuffTree _huffTree_00365[];
 	static const HuffTree _huffTree_00368[];
 	static const HuffTree _huffTree_00372[];
+#else
+public:
+	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;
+	static const HuffTree *_huffTree_00348;
+	static const HuffTree *_huffTree_00365;
+	static const HuffTree *_huffTree_00368;
+	static const HuffTree *_huffTree_00372;
+protected:
+#endif
 
 	static const PatchMessage _patchedMessages[NUM_PATCH_MSG];
 	static const uint16 _patchLangIdx[8];