From 38ee990e9fa26cbc55ac592107dd9a051f004456 Mon Sep 17 00:00:00 2001 From: ChrisL Date: Fri, 18 Apr 2008 05:21:01 +0000 Subject: [PATCH] Bugfix to stop a CTD that could occur if the system inadvertantly tries to stack two money objects that have a 0 uiMoneyAmount amount. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2043 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Item Types.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tactical/Item Types.cpp b/Tactical/Item Types.cpp index d5b51a5aa..73602dcf5 100644 --- a/Tactical/Item Types.cpp +++ b/Tactical/Item Types.cpp @@ -535,7 +535,7 @@ bool OBJECTTYPE::CanStack(OBJECTTYPE& sourceObject, int& numToStack) // average out the status values using a weighted average... int thisStatus = (*this)[0]->data.money.bMoneyStatus * (*this)[0]->data.money.uiMoneyAmount; int sourceStatus = sourceObject[0]->data.money.bMoneyStatus * sourceObject[0]->data.money.uiMoneyAmount; - int average = (*this)[0]->data.money.uiMoneyAmount + sourceObject[0]->data.money.uiMoneyAmount; + int average = __max((*this)[0]->data.money.uiMoneyAmount + sourceObject[0]->data.money.uiMoneyAmount,1); (*this)[0]->data.objectStatus = ( (thisStatus + sourceStatus) / average); (*this)[0]->data.money.uiMoneyAmount += sourceObject[0]->data.money.uiMoneyAmount;