1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merges.xml changes:

Browse Source 
-added APCost
-added secondResultingItemIndex
-renamed resultingItemIndex to secondResultingItemIndex

(see notes on wiki for usage)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@472 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
MaddMugsy
2006-08-25 21:41:00 +00:00
parent f64eaf15d8
commit bb1dae2a25
5 changed files with 96 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/XML_Merge.cpp
+19 -5
View File
@@ -85,7 +85,9 @@ mergeStartElementHandle(void *userData, const char *name, const char **atts)
else if(pData->curElement == ELEMENT &&
(strcmp(name, "firstItemIndex") == 0 ||
strcmp(name, "secondItemIndex") == 0 ||
strcmp(name, "resultingItemIndex") == 0 ||
strcmp(name, "firstResultingItemIndex") == 0 ||
strcmp(name, "secondResultingItemIndex") == 0 ||
strcmp(name, "APCost") == 0 ||
strcmp(name, "mergeType") == 0 ))
{
pData->curElement = ELEMENT_PROPERTY;
@@ -147,16 +149,26 @@ mergeEndElementHandle(void *userData, const char *name)
pData->curElement = ELEMENT;
pData->curMerge[1] = (UINT16) atol(pData->szCharData);
}
else if(strcmp(name, "resultingItemIndex") == 0)
else if(strcmp(name, "firstResultingItemIndex") == 0)
{
pData->curElement = ELEMENT;
pData->curMerge[2] = (UINT16) atol(pData->szCharData);
}
else if(strcmp(name, "mergeType") == 0)
else if(strcmp(name, "secondResultingItemIndex") == 0)
{
pData->curElement = ELEMENT;
pData->curMerge[3] = (UINT16) atol(pData->szCharData);
}
else if(strcmp(name, "mergeType") == 0)
{
pData->curElement = ELEMENT;
pData->curMerge[4] = (UINT16) atol(pData->szCharData);
}
else if(strcmp(name, "APCost") == 0)
{
pData->curElement = ELEMENT;
pData->curMerge[5] = (UINT16) atol(pData->szCharData);
}
pData->maxReadDepth--;
}
@@ -248,8 +260,10 @@ BOOLEAN WriteMergeStats()
FilePrintf(hFile,"\t\t<firstItemIndex>%d</firstItemIndex>\r\n", Merge[cnt][0]);
FilePrintf(hFile,"\t\t<secondItemIndex>%d</secondItemIndex>\r\n", Merge[cnt][1]);
FilePrintf(hFile,"\t\t<resultingItemIndex>%d</resultingItemIndex>\r\n", Merge[cnt][2]);
FilePrintf(hFile,"\t\t<mergeType>%d</mergeType>\r\n", Merge[cnt][3]);
FilePrintf(hFile,"\t\t<firstResultingItemIndex>%d</firstResultingItemIndex>\r\n", Merge[cnt][2]);
FilePrintf(hFile,"\t\t<secondResultingItemIndex>%d</secondResultingItemIndex>\r\n", Merge[cnt][3]);
FilePrintf(hFile,"\t\t<mergeType>%d</mergeType>\r\n", Merge[cnt][4]);
FilePrintf(hFile,"\t\t<APCost>%d</APCost>\r\n", Merge[cnt][5]);
FilePrintf(hFile,"\t</MERGE>\r\n");
}