From ef5fa36536bfc87fa2328a90bcd4b49b722a226b Mon Sep 17 00:00:00 2001 From: Flugente Date: Sun, 24 Feb 2013 15:56:50 +0000 Subject: [PATCH] Fix: decapitating/gutting/stripping/taking a corpse did not cost any APs git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5870 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Handle Items.cpp | 7 ++++++- Tactical/Turn Based Input.cpp | 6 ------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Tactical/Handle Items.cpp b/Tactical/Handle Items.cpp index 5224d2ba..2dcda0b7 100644 --- a/Tactical/Handle Items.cpp +++ b/Tactical/Handle Items.cpp @@ -4858,7 +4858,6 @@ void TacticalFunctionSelectionMessageBoxCallBack( UINT8 ubExitValue ) // undisguise or take off custom clothes Strip(gpTempSoldier); break; - case 5: // militia drops all gear taken from sector inventory TeamDropAll( MILITIA_TEAM ); @@ -4879,19 +4878,25 @@ void CorpseMessageBoxCallBack( UINT8 ubExitValue ) INT8 level = gpTempSoldier->bTargetLevel; + INT16 sAPCost = CalcTotalAPsToAttack( gpTempSoldier, nextGridNoinSight, FALSE, gpTempSoldier->aiData.bAimTime ); + switch (ubExitValue) { case 1: DecapitateCorpse( gpTempSoldier, nextGridNoinSight, level ); + DeductPoints( gpTempSoldier, sAPCost, 0 ); break; case 2: GutCorpse( gpTempSoldier, nextGridNoinSight, level ); + DeductPoints( gpTempSoldier, sAPCost, 0 ); break; case 3: StripCorpse( gpTempSoldier, nextGridNoinSight, level ); + DeductPoints( gpTempSoldier, sAPCost, 0 ); break; case 4: TakeCorpse( gpTempSoldier, nextGridNoinSight, level ); + DeductPoints( gpTempSoldier, sAPCost, 0 ); break; default: break; diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp index cae87786..7c570e84 100644 --- a/Tactical/Turn Based Input.cpp +++ b/Tactical/Turn Based Input.cpp @@ -4512,12 +4512,6 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) break; - // added by Flugente - case ':': - - TeamDropAll( MILITIA_TEAM ); - break; - case 'z': if( fCtrl && fAlt ) {