From d238927dd0a6dbbefb598d220e12eae7a08e6d96 Mon Sep 17 00:00:00 2001 From: Shadooow Date: Thu, 28 Oct 2021 08:48:54 +0000 Subject: [PATCH] detaching attachment will no longer check for 12AP more than it should, this was kind of safety check, but it is confusing and not needed anymore git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9199 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Interface Items.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp index d0ee5fb8..3ae6070d 100644 --- a/Tactical/Interface Items.cpp +++ b/Tactical/Interface Items.cpp @@ -6442,8 +6442,8 @@ void ItemDescAttachmentsCallback( MOUSE_REGION * pRegion, INT32 iReason ) } else { - // ATE: Make sure we have enough AP's to drop it if we pick it up! - if ( pAttachment->exists() && EnoughPoints( gpItemDescSoldier, ( AttachmentAPCost( pAttachment->usItem, gpItemDescObject, gpItemPointerSoldier ) + APBPConstants[AP_PICKUP_ITEM] ), 0, TRUE ) ) + // shadooow: removed checking extra cost for picking up the item + if ( pAttachment->exists() && EnoughPoints( gpItemDescSoldier, ( AttachmentAPCost( pAttachment->usItem, gpItemDescObject, gpItemPointerSoldier )), 0, TRUE ) ) { // Flugente: if we are trying to remove the detonators of an armed bomb, auto-fail: it explodes if ( gpItemPointerSoldier && ( (Item[gpItemDescObject->usItem].usItemClass & (IC_BOMB)) && ( ( (*gpItemDescObject)[ubStatusIndex]->data.misc.bDetonatorType == BOMB_TIMED ) || ( (*gpItemDescObject)[ubStatusIndex]->data.misc.bDetonatorType == BOMB_REMOTE ) ) ) )