1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix:

Browse Source 
- swapping items in tactical could lead to a situation where we don't have enough AP to put the item on the hand cursor anywhere. Now it is allowed to place the item in your inventory. The merc will have negative AP afterwards.

- removing an attachment and closing the UDB could lead to a situation where you don't have enough AP to attach the item on your hand cursor again when you notice that you don't have a slot available in inventory and not enough AP to simply drop the item. Attaching the attachment again is now possible. The merc will have negative AP afterwards.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6368 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
silversurfer
2013-09-06 19:14:09 +00:00
parent 1201807b09
commit a7ac10d630
2 changed files with 116 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface Items.cpp
+106 -3
View File
@@ -459,6 +459,7 @@ extern void StartSKIDescriptionBox( void );
void UpdateItemHatches();
void ShadowNIVPanel();
BOOLEAN CheckPocketEmpty( SOLDIERTYPE *pSoldier, INT16 sPocket );
extern void BeginInventoryPoolPtr( OBJECTTYPE *pInventorySlot );
@@ -6052,8 +6053,31 @@ void ItemDescAttachmentsCallback( MOUSE_REGION * pRegion, INT32 iReason )
// require as many APs as to reload
if ( gpItemPointer != NULL )
{
// silversurfer: Wait a minute. What if we have an item in hand, not enough AP to attach it and no space in inventory?
// This could happen if we just removed it from a weapon and are now low on AP. We will be stuck with an item at the hand cursor.
BOOLEAN bFreeSlot = FALSE;
// do we have enough AP to attach it again?
BOOLEAN bEnoughAP = EnoughPoints( gpItemPointerSoldier, AttachmentAPCost( gpItemPointer->usItem, gpItemDescObject, gpItemPointerSoldier ), 0, FALSE );
// not enough AP to attach so check if we could place the item somewhere in inventory
if ( !bEnoughAP && gpItemPointerSoldier )
{
for ( UINT8 loop = BODYPOSSTART; loop < SMALLPOCKFINAL; loop++ )
{
bFreeSlot = CanItemFitInPosition( gpItemPointerSoldier, gpItemPointer, loop, FALSE );
if ( bFreeSlot && CheckPocketEmpty( gpItemPointerSoldier, loop ) )
{
bFreeSlot = TRUE;
break;
}
else
bFreeSlot = FALSE;
}
}
// nb pointer could be NULL because of inventory manipulation in mapscreen from sector inv
if ( !gpItemPointerSoldier || EnoughPoints( gpItemPointerSoldier, AttachmentAPCost( gpItemPointer->usItem, gpItemDescObject, gpItemPointerSoldier ), 0, TRUE ) )
// if ( !gpItemPointerSoldier || EnoughPoints( gpItemPointerSoldier, AttachmentAPCost( gpItemPointer->usItem, gpItemDescObject, gpItemPointerSoldier ), 0, TRUE ) )
// we will attach if we have enough AP or when we don't have enough AP but also no inventory slot to place the attachment
if ( !gpItemPointerSoldier || bEnoughAP || ( !bEnoughAP && !bFreeSlot ) )
{
// if ( (Item[ gpItemPointer->usItem ].fFlags & ITEM_INSEPARABLE) && ValidAttachment( gpItemPointer->usItem, gpItemDescObject->usItem ) )
if ( (Item[ gpItemPointer->usItem ].inseparable == 1) && ValidAttachment( gpItemPointer->usItem, gpItemDescObject ) )
@@ -6096,11 +6120,17 @@ void ItemDescAttachmentsCallback( MOUSE_REGION * pRegion, INT32 iReason )
InternalInitEDBTooltipRegion(gpItemDescObject, guiCurrentItemDescriptionScreen);
}
}
else
{
// Display message if it's our own guy
if ( gpItemPointerSoldier->bTeam == gbPlayerNum )
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_UI_FEEDBACK, TacticalStr[ NOT_ENOUGH_APS_STR ] );
}
}
else
{
// ATE: Make sure we have enough AP's to drop it if we pick it up!
if ( pAttachment->exists() && (guiCurrentScreen==MAP_SCREEN ? EnoughPoints(gpItemDescSoldier, 2*AttachmentAPCost(pAttachment->usItem, gpItemDescObject, gpItemPointerSoldier), 0, TRUE) : EnoughPoints(gpItemDescSoldier, AttachmentAPCost(pAttachment->usItem, gpItemDescObject, gpItemPointerSoldier)+APBPConstants[AP_PICKUP_ITEM], 0, TRUE)) )//dnl ch65 040913 on map screen we cannot drop so check if we have double APs for remove and attach
if ( pAttachment->exists() && EnoughPoints( gpItemDescSoldier, ( AttachmentAPCost( pAttachment->usItem, gpItemDescObject, gpItemPointerSoldier ) + APBPConstants[AP_PICKUP_ITEM] ), 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 ) ) ) )
@@ -6605,7 +6635,7 @@ void RenderItemDescriptionBox( )
// - there is a transformation
// - we are in the game or map screen, it is a single item, and
// - the item is a grenade
// - the item is a bomb and has a detonator or remote detonator attached
// - the item is a bomb and has a detonator or remote detonator attached
BOOLEAN renderTransformIcon = FALSE;
if ( ( (guiCurrentScreen == GAME_SCREEN || guiCurrentScreen == MAP_SCREEN) && gpItemDescObject->ubNumberOfObjects == 1 ) &&
( (Item[gpItemDescObject->usItem].usItemClass == IC_GRENADE) ||
@@ -13771,3 +13801,76 @@ void ConfirmTransformationMessageBoxCallBack( UINT8 bExitValue )
guiTransformInProgressPrevScreen = 0;
}
}
BOOLEAN CheckPocketEmpty( SOLDIERTYPE *pSoldier, INT16 sPocket )
{
if ( pSoldier == NULL )
return FALSE;
// CHRISL: Only run if we're looking at a legitimate pocket
if((UsingNewInventorySystem() == false) && !oldInv[sPocket])
return FALSE;
if((pSoldier->flags.uiStatusFlags & SOLDIER_VEHICLE) && UsingNewInventorySystem() == true && !vehicleInv[sPocket])
return FALSE;
BOOLEAN bResult = FALSE;
INT16 lbePocket = ITEM_NOT_FOUND;
OBJECTTYPE *pObject;
pObject = &(pSoldier->inv[ sPocket ]);
// If sPocket is not an equiped pocket, gather pocket information
if(icClass[sPocket] != ITEM_NOT_FOUND)
{
switch (icClass[sPocket])
{
case THIGH_PACK:
case VEST_PACK:
case COMBAT_PACK:
case BACKPACK:
if(pSoldier->inv[icLBE[sPocket]].exists() == false)
{
lbePocket = LoadBearingEquipment[Item[icDefault[sPocket]].ubClassIndex].lbePocketIndex[icPocket[sPocket]];
}
else
{
lbePocket = LoadBearingEquipment[Item[pSoldier->inv[icLBE[sPocket]].usItem].ubClassIndex].lbePocketIndex[icPocket[sPocket]];
if( lbePocket == 0 && LoadBearingEquipment[Item[pSoldier->inv[icLBE[sPocket]].usItem].ubClassIndex].lbePocketsAvailable & (UINT16)pow((double)2, icPocket[sPocket]))
{
lbePocket = GetPocketFromAttachment(&pSoldier->inv[icLBE[sPocket]], icPocket[sPocket]);
}
}
if( icLBE[sPocket] == BPACKPOCKPOS && !(pSoldier->flags.ZipperFlag) && (gTacticalStatus.uiFlags & INCOMBAT) )
lbePocket = 0;
// pocket exists and not occupied
if ( lbePocket != 0 && pObject->exists() == false )
bResult = TRUE;
break;
case LBE_POCKET:
if ( pObject->exists() == false )
{
if ( sPocket == VESTPOCKPOS )
lbePocket = 0;
else if ( sPocket == LTHIGHPOCKPOS )
lbePocket = 1;
else if ( sPocket == RTHIGHPOCKPOS )
lbePocket = 2;
else if ( sPocket == CPACKPOCKPOS )
lbePocket = 3;
else if ( sPocket == BPACKPOCKPOS )
lbePocket = 4;
if ( lbePocket != ITEM_NOT_FOUND )
bResult = TRUE;
}
break;
case OTHER_POCKET:
default:
if ( pObject->exists() == false )
bResult = TRUE;
break;
}
}
return bResult;
}
Tactical/Interface Panels.cpp
+10 -2
View File
@@ -3891,8 +3891,16 @@ void SMInvClickCallback( MOUSE_REGION * pRegion, INT32 iReason )
}
else //we dont have enough APs to move it to this slot, show a warning message
{
ScreenMsg(FONT_MCOLOR_LTYELLOW, MSG_UI_FEEDBACK, TacticalStr[NOT_ENOUGH_APS_STR]);
fOKToGo = FALSE;
// silversurfer: What if our old slot is occupied now (could happen when we swap items)?
// We will be stuck with an item at the hand cursor and nowhere to put it -> bad. :-(
// So let's check if our old slot is empty and if it is not allow item placement anyway.
if ( gpSMCurrentMerc->inv[ uiLastHandPos ].usItem == NULL )
{
ScreenMsg(FONT_MCOLOR_LTYELLOW, MSG_UI_FEEDBACK, TacticalStr[NOT_ENOUGH_APS_STR]);
fOKToGo = FALSE;
}
else
fOKToGo = TRUE;
}
// We are doing this ourselve, continue