From 3f2fd185e60c0182c90c05ff3b1fa6602eb1907f Mon Sep 17 00:00:00 2001 From: Sevenfm Date: Sun, 25 Oct 2020 09:56:19 +0000 Subject: [PATCH] Improved EDB code: do not show PercentTargetTrackingSpeed and PercentDropCompensation when using OCTH. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8910 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Interface Enhanced.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Tactical/Interface Enhanced.cpp b/Tactical/Interface Enhanced.cpp index 0dcbdd2c..76439a95 100644 --- a/Tactical/Interface Enhanced.cpp +++ b/Tactical/Interface Enhanced.cpp @@ -10946,8 +10946,7 @@ void DrawAdvancedValues( OBJECTTYPE *gpItemDescObject ) iComparedModifier[1] = GetObjectModifier( gpItemDescSoldier, gpComparedItemDescObject, ANIM_CROUCH, ITEMMODIFIER_DROPCOMPENSATION ); iComparedModifier[2] = GetObjectModifier( gpItemDescSoldier, gpComparedItemDescObject, ANIM_PRONE, ITEMMODIFIER_DROPCOMPENSATION ); } - if ( ( (iModifier[0] != 0 || iModifier[1] != 0 || iModifier[2] != 0) ) || - ( fComparisonMode && (iComparedModifier[0] != 0 || iComparedModifier[1] != 0 || iComparedModifier[2] != 0) ) + if ((((iModifier[0] != 0 || iModifier[1] != 0 || iModifier[2] != 0)) || (fComparisonMode && (iComparedModifier[0] != 0 || iComparedModifier[1] != 0 || iComparedModifier[2] != 0))) && UsingNewCTHSystem() == true ) { if (cnt >= sFirstLine && cnt < sLastLine) @@ -11016,8 +11015,7 @@ void DrawAdvancedValues( OBJECTTYPE *gpItemDescObject ) iComparedModifier[1] = GetObjectModifier( gpItemDescSoldier, gpComparedItemDescObject, ANIM_CROUCH, ITEMMODIFIER_TRACKING ); iComparedModifier[2] = GetObjectModifier( gpItemDescSoldier, gpComparedItemDescObject, ANIM_PRONE, ITEMMODIFIER_TRACKING ); } - if ( ( (iModifier[0] != 0 || iModifier[1] != 0 || iModifier[2] != 0) ) || - ( fComparisonMode && (iComparedModifier[0] != 0 || iComparedModifier[1] != 0 || iComparedModifier[2] != 0) ) + if ((((iModifier[0] != 0 || iModifier[1] != 0 || iModifier[2] != 0)) || (fComparisonMode && (iComparedModifier[0] != 0 || iComparedModifier[1] != 0 || iComparedModifier[2] != 0))) && UsingNewCTHSystem() == true ) { if (cnt >= sFirstLine && cnt < sLastLine)