From b46f47cb046c0c86a384f35cedea1378a7da43c2 Mon Sep 17 00:00:00 2001
From: lalien <lalien@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Wed, 24 Jan 2007 12:07:39 +0000
Subject: [PATCH] - bug fix: no explosion if the rocket launcher was reloaded
 manually (with attaching a rocket/grenade)

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

diff --git a/GameVersion.cpp b/GameVersion.cpp
index 7c0434a8..fc43b249 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.665" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.679" };
 
 
 #endif
diff --git a/JA2.vcproj b/JA2.vcproj
index 512a4f8b..09db4861 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.665_EN.exe"
+				OutputFile="D:\games\Jagged Alliance 2 v1.13\ja2 v1.13.679_EN.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp
index b2f46b63..aba95e5a 100644
--- a/Tactical/Items.cpp
+++ b/Tactical/Items.cpp
@@ -3209,7 +3209,7 @@ BOOLEAN AttachObject( SOLDIERTYPE * pSoldier, OBJECTTYPE * pTargetObj, OBJECTTYP
 				if ( pAttachment->ubNumberOfObjects > 1 )
 				{
 					return( FALSE );
-				}
+				}				
 			}
 			else
 			{
@@ -3226,6 +3226,16 @@ BOOLEAN AttachObject( SOLDIERTYPE * pSoldier, OBJECTTYPE * pTargetObj, OBJECTTYP
 			}
 		}
 
+		//lalien: added to make a GL/RL work when reloaded manually
+		if (bAttachPos != ITEM_NOT_FOUND)
+		{
+			if ( Item[ pTargetObj->usItem ].usItemClass == IC_LAUNCHER || Item[pTargetObj->usItem].cannon )
+			{
+				pTargetObj->usGunAmmoItem = pAttachment->usItem; 	
+			}
+		}
+
+
 		if (bAttachPos == ITEM_NOT_FOUND)
 		{
 			return( FALSE );
@@ -3298,7 +3308,7 @@ BOOLEAN AttachObject( SOLDIERTYPE * pSoldier, OBJECTTYPE * pTargetObj, OBJECTTYP
 						pTargetObj->usAttachItem[bSecondAttachPos] = pAttachment->usAttachItem[0];
 						pTargetObj->bAttachStatus[bSecondAttachPos] = pAttachment->bAttachStatus[0];
 						pAttachment->usAttachItem[0] = NOTHING;
-						pAttachment->bAttachStatus[0] = 0;
+						pAttachment->bAttachStatus[0] = 0;						
 					}
 				}
 			}