Update to newest mingw, support LI version 1.2

Author: Mark Hutcheson

Makefile

@@ -1,10 +1,10 @@
 SHELL=C:/Windows/System32/cmd.exe
-objects = wordPackDict.o sndmanifest.o itemmanifest.o combodb.o residmap.o zpipe.o ogg.o image.o font.o loctex.o parse.o matrix.o
+objects = wordPackDict.o sndmanifest.o itemmanifest.o combodb.o residmap.o zpipe.o ogg.o image.o font.o loctex.o parse.o matrix.o tinyxml2.o
 decompressobjects = $(objects) liDecompress.o threadDecompress.o
 comressobjects = $(objects) liCompress.o threadCompress.o
 HEADERPATH = -I./include
 LIBPATH = -L./libs
-LIB = -lpng -lzlib -lttvfs -lvorbis -logg -ltinyxml2
+LIB = -lpng -lzlib -lttvfs -lvorbis -logg
 
 all : liDecompress.exe liCompress.exe recalcSoundManifest.exe strip.exe modManage.exe util/pullpakfiles.exe util/removeresc.exe util/repack.exe util/hash.exe util/WinResource.exe
 
@@ -13,7 +13,7 @@ liDecompress.exe : $(decompressobjects)
 liCompress.exe : $(comressobjects)
 	g++ -Wall -O2 -o $@ $(comressobjects) $(LIBPATH) $(LIB)
 recalcSoundManifest.exe : recalcSoundManifest.o
-	g++ -Wall -O2 -o $@ $< ogg.o $(LIBPATH) $(LIB)
+	g++ -Wall -O2 -o $@ $< ogg.o tinyxml2.o $(LIBPATH) $(LIB)
 strip.exe : strip.o
 	g++ -Wall -O2 -o $@ $<
 modManage.exe : modManage.o
@@ -27,7 +27,7 @@ util/repack.exe : util/repack.o
 util/WinResource.exe : util/WinResource.o
 	g++ -Wall -O2 -o $@ $<
 util/hash.exe : util/hash.o
-	g++ -Wall -O2 -o $@ $< residmap.o $(LIBPATH) -ltinyxml2
+	g++ -Wall -O2 -o $@ $< residmap.o tinyxml2.o
 
 %.o: %.cpp
 	g++ -O2 -c -MMD -o $@ $< $(HEADERPATH)

combodb.cpp

@@ -69,7 +69,7 @@ bool comboDBToXML(const wchar_t* cFilename)
 		}
 		vCombos.push_back(cr);
 	}
-	cout << "Done reading combos" << endl;
+	//cout << "Done reading combos" << endl;
 
 	//Read in combo items
 	vector<comboItemRecord> vComboItems;
@@ -85,7 +85,7 @@ bool comboDBToXML(const wchar_t* cFilename)
 		vComboItems.push_back(cir);
 	}
 
-	cout << "Done reading items" << endl;
+	//cout << "Done reading items" << endl;
 
 	//Read in string table-----------------------------------------------------------
 	//Read in string table header
@@ -157,6 +157,9 @@ bool comboDBToXML(const wchar_t* cFilename)
 		elem->SetAttribute("id", vCombos[i].id);	//TODO: What for???
 		elem->SetAttribute("coinvalue", vCombos[i].value);
 		elem->SetAttribute("stampvalue", vCombos[i].stampValue);
+#ifdef VERSION_12
+		elem->SetAttribute("stridx", vCombos[i].idStrTblIdx);
+#endif
 
 		//Write combo name
 		XMLElement* elem2 = doc->NewElement("name");
@@ -256,14 +259,21 @@ bool XMLToComboDB(const wchar_t* cFilename)
 			delete doc;
 			return false;
 		}
+#ifdef VERSION_12
+		if(elem->QueryIntAttribute("stridx", &cr.idStrTblIdx) != XML_NO_ERROR)
+		{
+			cout << "Unable to get idStrTblIdx from XML file " << ws2s(sXMLFile) << endl;
+			delete doc;
+			return false;
+		}
+#endif
 
 		cr.id = id;
 		cr.title.key = lStringTable.size();
 		cr.value = coinval;
 		cr.stampValue = stampval;
 		cr.firstItemIdx = lItemRecords.size();
 		cr.numItems = 0;
-		//TODO cr.idStrTblIdx = from XML when available
 		XMLElement* elem2 = elem->FirstChildElement("name");
 		if(elem2 == NULL) continue;
 		if(elem2->QueryUnsignedAttribute("strid", &cr.title.id) != XML_NO_ERROR)

image.cpp

@@ -468,12 +468,14 @@ bool myPicturesToXML(wstring sFilename)
 		memcpy(data, &ih, sizeof(ImageHeader));	//Copy in header
 		memcpy(&data[sizeof(ImageHeader)], &cPictureBytes[i->offset], i->width * i->height * 4);	//Copy in image data
 
-		wchar_t cName[256];
-		wsprintf(cName, TEXT("%s.%d.png"), sFilename.c_str(), iCurImg++);
-		convertToPNG(cName, data, i->width * i->height * 4);
-		
+		iCurImg++;
+		wstring sName = sFilename;
+		sName += TEXT(".");
+		sName.push_back(iCurImg + L'0');
+		sName += TEXT(".png");
+		convertToPNG(sName.c_str(), data, i->width * 4);
 		XMLElement* elem = doc->NewElement("image");
-		elem->SetAttribute("filename", ws2s(cName).c_str());
+		elem->SetAttribute("filename", ws2s(sName).c_str());
 		root->InsertEndChild(elem);
 	}
 
@@ -657,12 +659,14 @@ bool smokeImageToXML(wstring sFilename)
 			curPtr++;
 		}
 
-		wchar_t cName[256];
-		wsprintf(cName, TEXT("%s.%d.png"), sFilename.c_str(), iCurImg++);
-		convertToPNG(cName, data, i->width * i->height * 4);
-		
+		iCurImg++;
+		wstring sName = sFilename;
+		sName += TEXT(".");
+		sName.push_back(iCurImg + L'0');
+		sName += TEXT(".png");
+		convertToPNG(sName.c_str(), data, i->width * 4);
 		XMLElement* elem = doc->NewElement("image");
-		elem->SetAttribute("filename", ws2s(cName).c_str());
+		elem->SetAttribute("filename", ws2s(sName).c_str());
 		elem->SetAttribute("id", i->id);
 		root->InsertEndChild(elem);
 	}
@@ -842,11 +846,14 @@ bool fluidPalettesToXML(wstring sFilename)
 		memcpy(data, &ih, sizeof(ImageHeader));	//Copy in header
 		memcpy(&data[sizeof(ImageHeader)], &cPictureBytes[i->offset*4], i->width*4);	//Copy in image data
 
-		wchar_t cName[256];
-		wsprintf(cName, TEXT("%s.%d.png"), sFilename.c_str(), iCurImg++);
-		convertToPNG(cName, data, i->width * 4);
+		iCurImg++;
+		wstring sName = sFilename;
+		sName += TEXT(".");
+		sName.push_back(iCurImg + L'0');
+		sName += TEXT(".png");
+		convertToPNG(sName.c_str(), data, i->width * 4);
 		XMLElement* elem = doc->NewElement("image");
-		elem->SetAttribute("filename", ws2s(cName).c_str());
+		elem->SetAttribute("filename", ws2s(sName).c_str());
 		elem->SetAttribute("id", i->id);		
 		root->InsertEndChild(elem);
 	}

include/tinyxml2.h

@@ -14,6 +14,7 @@ not claim that you wrote the original software. If you use this
 software in a product, an acknowledgment in the product documentation
 would be appreciated but is not required.
 
+
 2. Altered source versions must be plainly marked as such, and
 must not be misrepresented as being the original software.
 
@@ -57,6 +58,23 @@ distribution.
 #   endif
 #endif
 
+#ifdef _MSC_VER
+#   pragma warning(push)
+#   pragma warning(disable: 4251)
+#endif
+
+#ifdef _WIN32
+#   ifdef TINYXML2_EXPORT
+#       define TINYXML2_LIB __declspec(dllexport)
+#   elif defined(TINYXML2_IMPORT)
+#       define TINYXML2_LIB __declspec(dllimport)
+#   else
+#       define TINYXML2_LIB
+#   endif
+#else
+#   define TINYXML2_LIB
+#endif
+
 
 #if defined(DEBUG)
 #   if defined(_MSC_VER)
@@ -108,11 +126,9 @@ class XMLDocument;
 class XMLElement;
 class XMLAttribute;
 class XMLComment;
-class XMLNode;
 class XMLText;
 class XMLDeclaration;
 class XMLUnknown;
-
 class XMLPrinter;
 
 /*
@@ -408,7 +424,7 @@ class MemPoolT : public MemPool
 
 	@sa XMLNode::Accept()
 */
-class XMLVisitor
+class TINYXML2_LIB XMLVisitor
 {
 public:
     virtual ~XMLVisitor() {}
@@ -554,7 +570,7 @@ class XMLUtil
 
 	@endverbatim
 */
-class XMLNode
+class TINYXML2_LIB XMLNode
 {
     friend class XMLDocument;
     friend class XMLElement;
@@ -820,7 +836,7 @@ class XMLNode
 	you generally want to leave it alone, but you can change the output mode with
 	SetCData() and query it with CData().
 */
-class XMLText : public XMLNode
+class TINYXML2_LIB XMLText : public XMLNode
 {
     friend class XMLBase;
     friend class XMLDocument;
@@ -859,7 +875,7 @@ class XMLText : public XMLNode
 
 
 /** An XML Comment. */
-class XMLComment : public XMLNode
+class TINYXML2_LIB XMLComment : public XMLNode
 {
     friend class XMLDocument;
 public:
@@ -897,7 +913,7 @@ class XMLComment : public XMLNode
 	The text of the declaration isn't interpreted. It is parsed
 	and written as a string.
 */
-class XMLDeclaration : public XMLNode
+class TINYXML2_LIB XMLDeclaration : public XMLNode
 {
     friend class XMLDocument;
 public:
@@ -929,7 +945,7 @@ class XMLDeclaration : public XMLNode
 
 	DTD tags get thrown into XMLUnknowns.
 */
-class XMLUnknown : public XMLNode
+class TINYXML2_LIB XMLUnknown : public XMLNode
 {
     friend class XMLDocument;
 public:
@@ -988,7 +1004,7 @@ enum XMLError {
 	@note The attributes are not XMLNodes. You may only query the
 	Next() attribute in a list.
 */
-class XMLAttribute
+class TINYXML2_LIB XMLAttribute
 {
     friend class XMLElement;
 public:
@@ -1089,7 +1105,7 @@ class XMLAttribute
 	and can contain other elements, text, comments, and unknowns.
 	Elements also contain an arbitrary number of attributes.
 */
-class XMLElement : public XMLNode
+class TINYXML2_LIB XMLElement : public XMLNode
 {
     friend class XMLBase;
     friend class XMLDocument;
@@ -1409,7 +1425,7 @@ enum Whitespace {
 	All Nodes are connected and allocated to a Document.
 	If the Document is deleted, all its Nodes are also deleted.
 */
-class XMLDocument : public XMLNode
+class TINYXML2_LIB XMLDocument : public XMLNode
 {
     friend class XMLElement;
 public:
@@ -1511,7 +1527,7 @@ class XMLDocument : public XMLNode
     	// printer.CStr() has a const char* to the XML
     	@endverbatim
     */
-    void Print( XMLPrinter* streamer=0 );
+    void Print( XMLPrinter* streamer=0 ) const;
     virtual bool Accept( XMLVisitor* visitor ) const;
 
     /**
@@ -1667,7 +1683,7 @@ class XMLDocument : public XMLNode
 
 	See also XMLConstHandle, which is the same as XMLHandle, but operates on const objects.
 */
-class XMLHandle
+class TINYXML2_LIB XMLHandle
 {
 public:
     /// Create a handle from any node (at any depth of the tree.) This can be a null pointer.
@@ -1751,7 +1767,7 @@ class XMLHandle
 	A variant of the XMLHandle class for working with const XMLNodes and Documents. It is the
 	same in all regards, except for the 'const' qualifiers. See XMLHandle for API.
 */
-class XMLConstHandle
+class TINYXML2_LIB XMLConstHandle
 {
 public:
     XMLConstHandle( const XMLNode* node )											{
@@ -1858,7 +1874,7 @@ class XMLConstHandle
 	printer.CloseElement();
 	@endverbatim
 */
-class XMLPrinter : public XMLVisitor
+class TINYXML2_LIB XMLPrinter : public XMLVisitor
 {
 public:
     /** Construct the printer. If the FILE* is specified,
@@ -1867,7 +1883,7 @@ class XMLPrinter : public XMLVisitor
     	If 'compact' is set to true, then output is created
     	with only required whitespace and newlines.
     */
-    XMLPrinter( FILE* file=0, bool compact = false );
+    XMLPrinter( FILE* file=0, bool compact = false, int depth = 0 );
     ~XMLPrinter()	{}
 
     /** If streaming, write the BOM and declaration. */
@@ -1964,5 +1980,8 @@ class XMLPrinter : public XMLVisitor
 
 }	// tinyxml2
 
+#if defined(_MSC_VER)
+#   pragma warning(pop)
+#endif
 
 #endif // TINYXML2_INCLUDED

itemmanifest.cpp

@@ -1095,7 +1095,7 @@ bool XMLToItemManifest(const wchar_t* cFilename)
 	list<effectDependency> lEffectDeps;
 	list<itemDependency> lItemDeps;
 	u32 binDataRunningTally = 0;	//Offset into the binary data for each item
-	list<itemDataHeader> lItemData;
+	vector<itemDataHeader> lItemData;	//Everything here and below should be vectors so I can access as needed
 	for(list<wstring>::iterator i = lItemManifestFilenames.begin(); i != lItemManifestFilenames.end(); i++)
 	{
 		doc = new XMLDocument;
@@ -1377,6 +1377,22 @@ bool XMLToItemManifest(const wchar_t* cFilename)
 			delete doc;
 			return false;
 		}
+		const char* cVec = elem->Attribute("iconAnimBoundsMin");
+		if(cVec == NULL)
+		{
+			cout << "Unable to read iconAnimBoundsMin from XML file " << ws2s(*i) << endl;
+			delete doc;
+			return false;
+		}
+		idh.iconAnimBoundsMin = stringToVec2(cVec);
+		cVec = elem->Attribute("iconAnimBoundsMax");
+		if(cVec == NULL)
+		{
+			cout << "Unable to read iconAnimBoundsMax from XML file " << ws2s(*i) << endl;
+			delete doc;
+			return false;
+		}
+		idh.iconAnimBoundsMax = stringToVec2(cVec);
 
 		//TODO iconanimboundsmax/min.x/y
 
@@ -1440,9 +1456,7 @@ bool XMLToItemManifest(const wchar_t* cFilename)
 	BinHdrPtr bonePartTreeVals;
 	BinHdrPtr rgnCells;
 	BinHdrPtr stringTableBytes;
-	BinHdrPtr burnGridUsedDataBytes;
-	vec2 iconAnimBoundsMin;
-	vec2 iconAnimBoundsMax;*/
+	BinHdrPtr burnGridUsedDataBytes;*/
 
 
 		//...

libs/libtinyxml2.a

@@ -3,6 +3,8 @@
 #ifndef PAKDATATYPES_H
 #define PAKDATATYPES_H
 
+#define VERSION_12
+
 #include <cstdio>
 #include <tinyxml2.h>
 #include <stdint.h>
@@ -531,7 +533,9 @@ typedef struct
 typedef struct
 {
 	u32 id;
-	//i32 idStrTblIdx; //WHOA NELLIE This isn't here any more or something
+#ifdef VERSION_12
+	i32 idStrTblIdx; //This isn't here for version 1.1 or less
+#endif
 	BinLocStrKey title;
 	i32 value;
 	i32 stampValue;