From 3d12b39d87e93f3e7831bdc67e3dbe223c150376 Mon Sep 17 00:00:00 2001 From: Flugente Date: Fri, 29 Nov 2013 17:49:23 +0000 Subject: [PATCH] Fix: suppression resistance modifiers could exceed boundaries (by Sevenfm) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6664 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Overhead.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp index 00b6be9fa..1ca23cd9b 100644 --- a/Tactical/Overhead.cpp +++ b/Tactical/Overhead.cpp @@ -8007,12 +8007,11 @@ INT8 CalcSuppressionTolerance( SOLDIERTYPE * pSoldier ) bTolerance += (bTolerance * gSkillTraitValues.ubSLOverallSuppresionBonusPercent * ubNumberOfSL / 100); } - bTolerance = __max(bTolerance, gGameExternalOptions.ubSuppressionToleranceMin); - bTolerance = __min(bTolerance, gGameExternalOptions.ubSuppressionToleranceMax); - // Flugente: add personal bonus to suppresion tolerance bTolerance += pSoldier->GetSuppressionResistanceBonus(); + bTolerance = __max(bTolerance, gGameExternalOptions.ubSuppressionToleranceMin); + bTolerance = __min(bTolerance, gGameExternalOptions.ubSuppressionToleranceMax); return( bTolerance ); }