From 3eba067b6a111f5b3375d7101138e0401b8b1991 Mon Sep 17 00:00:00 2001 From: Sevenfm Date: Fri, 7 May 2021 17:40:03 +0000 Subject: [PATCH] Fix for switch weapon shortcuts taking more AP than doing it manually when inventory costs are enabled (by Shadooow). git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9007 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Soldier Control.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp index ca0738a79..842e1b397 100644 --- a/Tactical/Soldier Control.cpp +++ b/Tactical/Soldier Control.cpp @@ -17340,6 +17340,9 @@ void SOLDIERTYPE::SwitchWeapons( BOOLEAN fKnife, BOOLEAN fSideArm ) if ( this->inv[HANDPOS].exists( ) ) APTotalCost += GetInvMovementCost( &this->inv[HANDPOS], HANDPOS, handobjstorageslot ); + // Flugente: backgrounds + APTotalCost = (APTotalCost * (100 + this->GetBackgroundValue(BG_INVENTORY))) / 100; + if ( this->bActionPoints >= APTotalCost ) { // SANDRO - I dared to change this to use the appropriate function, as that function is actually important for IIS