From c284e87780623ee4a5100946e9cdb2c6abefd7c7 Mon Sep 17 00:00:00 2001
From: lalien <lalien@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Mon, 12 Jun 2006 18:06:29 +0000
Subject: [PATCH] - The weapons were deprecating too fast due to wrong item in
 reliability calculation (2x gun reliability, now gun + ammo reliability)

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

diff --git a/GameVersion.cpp b/GameVersion.cpp
index 45251164b..b8663b785 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.221" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.223" };
 
 
 #endif
diff --git a/JA2.vcproj b/JA2.vcproj
index b11861df0..fae3c32fb 100644
--- a/JA2.vcproj
+++ b/JA2.vcproj
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libexpatMT.lib mss32.lib winmm.lib smackw32.lib fmodvc.lib"
-				OutputFile="C:\games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.221_2006_06_11.exe"
+				OutputFile="C:\games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.223_2006_06_12.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
@@ -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_release_v1.13.221_2006_06_11.exe"
+				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.223_2006_06_12.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
diff --git a/Tactical/Weapons.cpp b/Tactical/Weapons.cpp
index ef921af35..33c4ce252 100644
--- a/Tactical/Weapons.cpp
+++ b/Tactical/Weapons.cpp
@@ -1912,8 +1912,12 @@ BOOLEAN UseGun( SOLDIERTYPE *pSoldier , INT16 sTargetGridNo )
 
 	// CJC: since jamming is no longer affected by reliability, increase chance of status going down for really unreliabile guns
  	INT16 ammoReliability = 0; // Madd: ammo reliability affects gun
+
 	if ( Item[usItemNum].usItemClass == IC_GUN )
-		ammoReliability = Item[pSoldier->inv[pSoldier->ubAttackingHand].usItem].bReliability;
+	{
+		OBJECTTYPE *pGun = &(pSoldier->inv[pSoldier->ubAttackingHand]);
+		ammoReliability = Item[pGun->usGunAmmoItem].bReliability;		
+	}
 
 	uiDepreciateTest = BASIC_DEPRECIATE_CHANCE + 3 * (Item[ usItemNum ].bReliability + ammoReliability);