1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bugfix: CTD bug when stealing (thx to Brent Johnson aka Nonomori)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@522 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2006-09-11 07:31:24 +00:00
parent 10a82b29c8
commit 4816beb53a
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JA2.suo
BIN
View File
Binary file not shown.
Tactical/Interface Items.cpp
+17 -6
View File
@@ -6980,10 +6980,6 @@ void ItemPickupCancel( GUI_BUTTON *btn, INT32 reason )
if(reason & MSYS_CALLBACK_REASON_LBUTTON_DWN ) if(reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
{ {
btn->uiFlags |= BUTTON_CLICKED_ON; btn->uiFlags |= BUTTON_CLICKED_ON;
if (gfStealing) //jackaians modif
{
DeletePool(gItemPickupMenu.pItemPool);
}
} }
else if(reason & MSYS_CALLBACK_REASON_LBUTTON_UP ) else if(reason & MSYS_CALLBACK_REASON_LBUTTON_UP )
{ {
@@ -6991,6 +6987,12 @@ void ItemPickupCancel( GUI_BUTTON *btn, INT32 reason )
// OK, pickup item.... // OK, pickup item....
gItemPickupMenu.fHandled = TRUE; gItemPickupMenu.fHandled = TRUE;
// Nonomori: Fix crash-on-cancel by doing this here instead of on the ...LBUTTON_DWN event
if (gfStealing) //jackaians modif
{
DeletePool(gItemPickupMenu.pItemPool);
}
} }
else if(reason & MSYS_CALLBACK_REASON_LOST_MOUSE ) else if(reason & MSYS_CALLBACK_REASON_LOST_MOUSE )
{ {
@@ -7023,13 +7025,22 @@ void ItemPickMenuMouseMoveCallback( MOUSE_REGION * pRegion, INT32 iReason )
// Show compatible ammo... // Show compatible ammo...
pTempItemPool = gItemPickupMenu.ItemPoolSlots[ gItemPickupMenu.bCurSelect - gItemPickupMenu.ubScrollAnchor ]; pTempItemPool = gItemPickupMenu.ItemPoolSlots[ gItemPickupMenu.bCurSelect - gItemPickupMenu.ubScrollAnchor ];
memcpy( &(gItemPickupMenu.CompAmmoObject), &( gWorldItems[ pTempItemPool->iItemIndex ].o ), sizeof( OBJECTTYPE ) ); // Nonomori: Fix crash caused by stealing ammo in a sector with no items loaded.
// memcpy( &(gItemPickupMenu.CompAmmoObject), &( gWorldItems[ pTempItemPool->iItemIndex ].o ), sizeof( OBJECTTYPE ) );
OBJECTTYPE * pCompAmmoObject = (OBJECTTYPE *) _alloca( sizeof( OBJECTTYPE ) );
if ( gWorldItems && gWorldItems[ pTempItemPool->iItemIndex ].fExists )
pCompAmmoObject = &( gWorldItems[ pTempItemPool->iItemIndex ].o );
else
CreateItem( pTempItemPool->iItemIndex, 100, pCompAmmoObject);
memcpy( &(gItemPickupMenu.CompAmmoObject), pCompAmmoObject, sizeof( OBJECTTYPE ) );
// Turn off first... // Turn off first...
HandleAnyMercInSquadHasCompatibleStuff( (INT8) CurrentSquad( ), NULL, TRUE ); HandleAnyMercInSquadHasCompatibleStuff( (INT8) CurrentSquad( ), NULL, TRUE );
InternalHandleCompatibleAmmoUI( gpSMCurrentMerc, &( gItemPickupMenu.CompAmmoObject ), TRUE ); InternalHandleCompatibleAmmoUI( gpSMCurrentMerc, &( gItemPickupMenu.CompAmmoObject ), TRUE );
HandleAnyMercInSquadHasCompatibleStuff( (INT8)CurrentSquad( ), &(gWorldItems[ pTempItemPool->iItemIndex ].o ), FALSE ); // Nonomori: Fix crash caused by stealing ammo in a sector with no items loaded.
// HandleAnyMercInSquadHasCompatibleStuff( (INT8)CurrentSquad( ), &(gWorldItems[ pTempItemPool->iItemIndex ].o ), FALSE );
HandleAnyMercInSquadHasCompatibleStuff( (INT8)CurrentSquad( ), pCompAmmoObject, FALSE );
SetItemPickupMenuDirty( DIRTYLEVEL2 ); SetItemPickupMenuDirty( DIRTYLEVEL2 );