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

BUGFIX 536 - Fixed it so we don't lose items when attempting to hand an invalid item to an NPC.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4516 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
ChrisL
2011-06-21 16:07:49 +00:00
parent 19416a395b
commit 9073f66572
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Handle Items.cpp
+8 -5
View File
@@ -4206,12 +4206,15 @@ void SoldierGiveItemFromAnimation( SOLDIERTYPE *pSoldier )
}
else
{
//CHRISL: The item we're handing over potentially came from an inventory slot but was placed into the cursor. So why are we deleting any remaining
// items left in the inventory slot we started from. When we moved the item from a stack into the cursor, we created a seperate stack and it's this
// new stack we should be exclusively working with. Not the stack we took items from.
// Erase!
if ( bInvPos != NO_SLOT )
{
DeleteObj(&pSoldier->inv[ bInvPos ]);
DirtyMercPanelInterface( pSoldier, DIRTYLEVEL2 );
}
// if ( bInvPos != NO_SLOT )
// {
// DeleteObj(&pSoldier->inv[ bInvPos ]);
// DirtyMercPanelInterface( pSoldier, DIRTYLEVEL2 );
// }
// Now intiate conv
InitiateConversation( pTSoldier, pSoldier, APPROACH_GIVINGITEM, (INT32)&gTempObject );
Tactical/Interface Items.cpp
+7 -6
View File
@@ -6353,15 +6353,16 @@ BOOLEAN HandleItemPointerClick( INT32 usMapPos )
sAPCost = GetAPsToGiveItem( gpItemPointerSoldier, usMapPos );
}
//CHRISL: This doesn't make sense to me. If we take an item out of a stack and then click on something, why would we first attempt to put the item
// back in the stack we took it from. The item in the cursor should be recognized as a seperate stack at this point.
// Place it back in our hands!
gTempObject = *gpItemPointer;
if ( gbItemPointerSrcSlot != NO_SLOT )
{
PlaceObject( gpItemPointerSoldier, gbItemPointerSrcSlot, gpItemPointer );
fInterfacePanelDirty = DIRTYLEVEL2;
}
// if ( gbItemPointerSrcSlot != NO_SLOT )
// {
// PlaceObject( gpItemPointerSoldier, gbItemPointerSrcSlot, gpItemPointer );
// fInterfacePanelDirty = DIRTYLEVEL2;
// }
/*
//if the user just clicked on an arms dealer
if( IsMercADealer( MercPtrs[ ubSoldierID ]->ubProfile ) )