From 97d1204b9ff1250b33560d7541ac6e25da56a93b Mon Sep 17 00:00:00 2001 From: MaddMugsy Date: Sun, 27 Aug 2006 04:37:05 +0000 Subject: [PATCH] -bugfix: merges not working -bugfix: attachments not costing APs git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@479 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameVersion.cpp | 2 +- Tactical/XML_Attachments.cpp | 1 + Tactical/XML_Merge.cpp | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/GameVersion.cpp b/GameVersion.cpp index 60319c54..dcbc1963 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -23,7 +23,7 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - INT16 zVersionLabel[256] = { L"Release v1.13.478" }; + INT16 zVersionLabel[256] = { L"Release v1.13.479" }; #endif diff --git a/Tactical/XML_Attachments.cpp b/Tactical/XML_Attachments.cpp index 8db8b913..a1b45591 100644 --- a/Tactical/XML_Attachments.cpp +++ b/Tactical/XML_Attachments.cpp @@ -132,6 +132,7 @@ attachmentEndElementHandle(void *userData, const char *name) //DebugMsg(TOPIC_JA2, DBG_LEVEL_3,"AttachmentStartElementHandle: writing attachment to array"); Attachment[pData->curIndex][0] = pData->curAttachment[0]; //write the attachment into the table Attachment[pData->curIndex][1] = pData->curAttachment[1]; + Attachment[pData->curIndex][2] = pData->curAttachment[2]; } } else if(strcmp(name, "attachmentIndex") == 0) diff --git a/Tactical/XML_Merge.cpp b/Tactical/XML_Merge.cpp index 171e8816..4a1572b0 100644 --- a/Tactical/XML_Merge.cpp +++ b/Tactical/XML_Merge.cpp @@ -137,6 +137,8 @@ mergeEndElementHandle(void *userData, const char *name) Merge[pData->curIndex][1] = pData->curMerge[1]; Merge[pData->curIndex][2] = pData->curMerge[2]; Merge[pData->curIndex][3] = pData->curMerge[3]; + Merge[pData->curIndex][4] = pData->curMerge[4]; + Merge[pData->curIndex][5] = pData->curMerge[5]; } } else if(strcmp(name, "firstItemIndex") == 0)