1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

bug fixes from Overhaul:

Browse Source 
- Data type changes 
- Templates removed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2007-05-09 13:16:37 +00:00
parent 61d6152ce5
commit 0530b53b9c
256 changed files with 2000 additions and 2228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/XML_Merge.cpp
+4 -4
View File
@@ -48,7 +48,7 @@ struct
{
PARSE_STAGE curElement;
INT8 szCharData[MAX_CHAR_DATA_LENGTH+1];
CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1];
UINT16 curMerge[6];
UINT32 maxArraySize;
@@ -59,7 +59,7 @@ struct
typedef mergeParseData;
static void XMLCALL
mergeStartElementHandle(void *userData, const char *name, const char **atts)
mergeStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts)
{
mergeParseData * pData = (mergeParseData *)userData;
@@ -103,7 +103,7 @@ mergeStartElementHandle(void *userData, const char *name, const char **atts)
}
static void XMLCALL
mergeCharacterDataHandle(void *userData, const char *str, int len)
mergeCharacterDataHandle(void *userData, const XML_Char *str, int len)
{
mergeParseData * pData = (mergeParseData *)userData;
@@ -116,7 +116,7 @@ mergeCharacterDataHandle(void *userData, const char *str, int len)
static void XMLCALL
mergeEndElementHandle(void *userData, const char *name)
mergeEndElementHandle(void *userData, const XML_Char *name)
{
mergeParseData * pData = (mergeParseData *)userData;