From e4d8bfa05831a6ecf49cd69601bb99911bc8e6b1 Mon Sep 17 00:00:00 2001
From: lalien <lalien@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Wed, 17 Jan 2007 19:42:32 +0000
Subject: [PATCH] - bug fix: when merging an item to a stack of items all of
 them were converted to a new item

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

diff --git a/GameVersion.cpp b/GameVersion.cpp
index f50b01e8..735cf796 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.661" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.662" };
 
 
 #endif
diff --git a/JA2.vcproj b/JA2.vcproj
index bbf9212f..0a256b7e 100644
--- a/JA2.vcproj
+++ b/JA2.vcproj
@@ -546,7 +546,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib"
-				OutputFile="C:\games\Jagged Alliance 2 v1.13\ja2 v1.13.661_EN.exe"
+				OutputFile="D:\games\Jagged Alliance 2 v1.13\ja2 v1.13.662_EN.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp
index c35bf430..b2f46b63 100644
--- a/Tactical/Items.cpp
+++ b/Tactical/Items.cpp
@@ -3131,6 +3131,8 @@ INT8 GetAttachmentComboMerge( OBJECTTYPE * pObj )
 	return( -1 );
 }
 
+
+
 void PerformAttachmentComboMerge( OBJECTTYPE * pObj, INT8 bAttachmentComboMerge )
 {
 	INT8		bAttachLoop, bAttachPos;
@@ -3165,10 +3167,14 @@ void PerformAttachmentComboMerge( OBJECTTYPE * pObj, INT8 bAttachmentComboMerge
 	pObj->usItem = AttachmentComboMerge[ bAttachmentComboMerge ].usResult;
 	pObj->bStatus[ 0 ] = (INT8) (uiStatusTotal / bNumStatusContributors );
 }
+
+
 BOOLEAN AttachObject( SOLDIERTYPE * pSoldier, OBJECTTYPE * pTargetObj, OBJECTTYPE * pAttachment )
 {
 	return AttachObject( pSoldier, pTargetObj, pAttachment, TRUE );
 }
+
+
 BOOLEAN AttachObject( SOLDIERTYPE * pSoldier, OBJECTTYPE * pTargetObj, OBJECTTYPE * pAttachment, BOOLEAN playSound )
 {
 	INT8		bAttachPos, bSecondAttachPos;//, bAbility, bSuccess;
@@ -3179,6 +3185,12 @@ BOOLEAN AttachObject( SOLDIERTYPE * pSoldier, OBJECTTYPE * pTargetObj, OBJECTTYP
 	INT8		bAttachInfoIndex = -1, bAttachComboMerge;
 	BOOLEAN	fValidLaunchable = FALSE;
 
+
+	if ( pTargetObj->ubNumberOfObjects > 1 )
+	{
+		return( FALSE );
+	}
+
 	fValidLaunchable = ValidLaunchable( pAttachment->usItem, pTargetObj->usItem );
 
 	if ( fValidLaunchable || ValidItemAttachment( pTargetObj, pAttachment->usItem, TRUE ) )