From ace3863569da195375f5ccbdede959bb222805dd Mon Sep 17 00:00:00 2001
From: MaddMugsy <MaddMugsy@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Fri, 25 Aug 2006 22:09:28 +0000
Subject: [PATCH] -quick bug fix reading in merges.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@473 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 GameVersion.cpp        | 2 +-
 Tactical/XML_Merge.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/GameVersion.cpp b/GameVersion.cpp
index c878b97a..d7cde497 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.472" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.473" };
 
 
 #endif
diff --git a/Tactical/XML_Merge.cpp b/Tactical/XML_Merge.cpp
index a4eaea9d..171e8816 100644
--- a/Tactical/XML_Merge.cpp
+++ b/Tactical/XML_Merge.cpp
@@ -50,7 +50,7 @@ struct
 
 	INT8		szCharData[MAX_CHAR_DATA_LENGTH+1];
 
-	UINT16			curMerge[4];
+	UINT16			curMerge[6];
 	UINT32			maxArraySize;
 	UINT32			curIndex;	
 	UINT32			currentDepth;