From 9602a679466d0284d1b640a1abd6538271c8d6fe Mon Sep 17 00:00:00 2001 From: silversurfer Date: Sun, 13 Oct 2013 14:31:43 +0000 Subject: [PATCH] Bugfix for JaggZilla bug #566 - max coolness was calculated wrong and was below min coolness. This couldn't work well... git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6485 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/ArmsDealerInvInit.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Tactical/ArmsDealerInvInit.cpp b/Tactical/ArmsDealerInvInit.cpp index b5a2b040..dd901eaa 100644 --- a/Tactical/ArmsDealerInvInit.cpp +++ b/Tactical/ArmsDealerInvInit.cpp @@ -1028,7 +1028,9 @@ UINT8 GetCurrentSuitabilityForItem( INT8 bArmsDealer, UINT16 usItemIndex, BOOLEA ubMinCoolness += armsDealerInfo[bArmsDealer].addToCoolness; ubMaxCoolness += armsDealerInfo[bArmsDealer].addToCoolness; ubMinCoolness = max( armsDealerInfo[bArmsDealer].minCoolness, min( 9, ubMinCoolness ) ); - ubMaxCoolness = max( 2, min( armsDealerInfo[bArmsDealer].maxCoolness, ubMaxCoolness ) ); + // silversurfer: max coolness should never be lower than min coolness! + //ubMaxCoolness = max( 2, min( armsDealerInfo[bArmsDealer].maxCoolness, ubMaxCoolness ) ); + ubMaxCoolness = max( (ubMinCoolness + 1), min( armsDealerInfo[bArmsDealer].maxCoolness, ubMaxCoolness ) ); } /* if (bArmsDealer == ARMS_DEALER_TONY)