mirror of
https://github.com/1dot13/source.git
synced 2026-07-29 13:52:17 +02:00
-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
This commit is contained in:
+1
-1
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user