From c8a395fa21713782da996771ba2c0d2b0e3ce75b Mon Sep 17 00:00:00 2001
From: MaddMugsy <MaddMugsy@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Tue, 29 Aug 2006 07:03:26 +0000
Subject: [PATCH] -fixed percentstatusdrainreduction usage in UseKitPoints

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

diff --git a/GameVersion.cpp b/GameVersion.cpp
index 994e2a66..6ffa6041 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.480" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.489" };
 
 
 #endif
diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp
index 004134c3..94e36ab5 100644
--- a/Tactical/Items.cpp
+++ b/Tactical/Items.cpp
@@ -4415,12 +4415,14 @@ UINT16 UseKitPoints( OBJECTTYPE * pObj, UINT16 usPoints, SOLDIERTYPE *pSoldier )
 
 	for (bLoop = pObj->ubNumberOfObjects - 1; bLoop >= 0; bLoop--)
 	{
-		if (usPoints < (UINT16) pObj->bStatus[bLoop])
+		if (Item[pObj->usItem].percentstatusdrainreduction  > 0 && ((usPoints * (100 - Item[pObj->usItem].percentstatusdrainreduction))/100) < pObj->bStatus[bLoop] )
 		{
-			if ( Item[pObj->usItem].percentstatusdrainreduction  > 0 )
-				pObj->bStatus[bLoop] -= (INT8) ((usPoints * (100 - Item[pObj->usItem].percentstatusdrainreduction ) )/100);
-			else	
-				pObj->bStatus[bLoop] -= (INT8) usPoints;
+			pObj->bStatus[bLoop] -= (INT8) ((usPoints * (100 - Item[pObj->usItem].percentstatusdrainreduction ) )/100);
+			return( usOriginalPoints );
+		}
+		else if (usPoints < (UINT16) pObj->bStatus[bLoop])
+		{
+			pObj->bStatus[bLoop] -= (INT8) usPoints;
 			return( usOriginalPoints );
 		}
 		else