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

Fixed an item duplication bug related to the item description window and unloading a weapon.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2013 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
ChrisL
2008-04-11 18:04:29 +00:00
parent 104f964760
commit 4d4536a8ee
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface Items.cpp
+10 -4
View File
@@ -3407,8 +3407,11 @@ void ItemDescAmmoCallback(GUI_BUTTON *btn,INT32 reason)
if(gpItemPointer == NULL) if(gpItemPointer == NULL)
{ {
//not holding anything //not holding anything
gTempObject.MoveThisObjectTo(gItemPointer); if(gTempObject.exists() == true)
gpItemPointer = &gItemPointer; {
gTempObject.MoveThisObjectTo(gItemPointer);
gpItemPointer = &gItemPointer;
}
} }
else else
{ {
@@ -3484,8 +3487,11 @@ void ItemDescAmmoCallback(GUI_BUTTON *btn,INT32 reason)
if(gpItemPointer == NULL) if(gpItemPointer == NULL)
{ {
//not holding anything //not holding anything
gTempObject.MoveThisObjectTo(gItemPointer); if(gTempObject.exists() == true)
gpItemPointer = &gItemPointer; {
gTempObject.MoveThisObjectTo(gItemPointer);
gpItemPointer = &gItemPointer;
}
} }
else else
{ {
Tactical/Items.cpp
+2
View File
@@ -3167,6 +3167,8 @@ BOOLEAN EmptyWeaponMagazine( OBJECTTYPE * pWeapon, OBJECTTYPE *pAmmo, UINT32 sub
} }
else else
{ {
//CHRISL: Clear the contents of pAmmo just in case
pAmmo->initialize();
return( FALSE ); return( FALSE );
} }
} }