diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp index 0785257c..a0e1f80a 100644 --- a/Tactical/Interface Items.cpp +++ b/Tactical/Interface Items.cpp @@ -3407,8 +3407,11 @@ void ItemDescAmmoCallback(GUI_BUTTON *btn,INT32 reason) if(gpItemPointer == NULL) { //not holding anything - gTempObject.MoveThisObjectTo(gItemPointer); - gpItemPointer = &gItemPointer; + if(gTempObject.exists() == true) + { + gTempObject.MoveThisObjectTo(gItemPointer); + gpItemPointer = &gItemPointer; + } } else { @@ -3484,8 +3487,11 @@ void ItemDescAmmoCallback(GUI_BUTTON *btn,INT32 reason) if(gpItemPointer == NULL) { //not holding anything - gTempObject.MoveThisObjectTo(gItemPointer); - gpItemPointer = &gItemPointer; + if(gTempObject.exists() == true) + { + gTempObject.MoveThisObjectTo(gItemPointer); + gpItemPointer = &gItemPointer; + } } else { diff --git a/Tactical/Items.cpp b/Tactical/Items.cpp index 65158044..8b5b8d72 100644 --- a/Tactical/Items.cpp +++ b/Tactical/Items.cpp @@ -3167,6 +3167,8 @@ BOOLEAN EmptyWeaponMagazine( OBJECTTYPE * pWeapon, OBJECTTYPE *pAmmo, UINT32 sub } else { + //CHRISL: Clear the contents of pAmmo just in case + pAmmo->initialize(); return( FALSE ); } }