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

Fix: crash when attempting to create illegal item

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8460 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2017-08-26 21:18:02 +00:00
parent 5f5b1f27c4
commit a8197d5db7
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Items.cpp
+9 -4
View File
@@ -3325,6 +3325,10 @@ BOOLEAN ReloadGun( SOLDIERTYPE * pSoldier, OBJECTTYPE * pGun, OBJECTTYPE * pAmmo
// record old ammo // record old ammo
CreateAmmo((*pGun)[subObject]->data.gun.usGunAmmoItem, &gTempObject, (*pGun)[subObject]->data.gun.ubGunShotsLeft); CreateAmmo((*pGun)[subObject]->data.gun.usGunAmmoItem, &gTempObject, (*pGun)[subObject]->data.gun.ubGunShotsLeft);
// Flugente: safety check: if object is broken, wipe it
if ( gTempObject.usItem == NOTHING )
gTempObject.initialize( );
if (fSameMagazineSize) if (fSameMagazineSize)
{ {
if (fSameAmmoType) if (fSameAmmoType)
@@ -3470,7 +3474,8 @@ BOOLEAN ReloadGun( SOLDIERTYPE * pSoldier, OBJECTTYPE * pGun, OBJECTTYPE * pAmmo
if (fReloadingWithStack) if (fReloadingWithStack)
{ {
// add to end of stack // add to end of stack
pAmmo->AddObjectsToStack( gTempObject, 1 ); if ( gTempObject.exists( ) )
pAmmo->AddObjectsToStack( gTempObject, 1 );
} }
else else
{ {
@@ -3482,7 +3487,7 @@ BOOLEAN ReloadGun( SOLDIERTYPE * pSoldier, OBJECTTYPE * pGun, OBJECTTYPE * pAmmo
|| pAmmo->ubNumberOfObjects > 1) || pAmmo->ubNumberOfObjects > 1)
{ {
// try autoplace // try autoplace
if ( !AutoPlaceObject( pSoldier, &gTempObject, FALSE ) ) if ( gTempObject.exists( ) && !AutoPlaceObject( pSoldier, &gTempObject, FALSE ) )
{ {
// put it on the ground // put it on the ground
AddItemToPool( pSoldier->sGridNo, &gTempObject, 1, pSoldier->pathing.bLevel, 0 , -1 ); AddItemToPool( pSoldier->sGridNo, &gTempObject, 1, pSoldier->pathing.bLevel, 0 , -1 );
@@ -3498,7 +3503,7 @@ BOOLEAN ReloadGun( SOLDIERTYPE * pSoldier, OBJECTTYPE * pGun, OBJECTTYPE * pAmmo
} }
break; break;
case RELOAD_AUTOPLACE_OLD: case RELOAD_AUTOPLACE_OLD:
if ( !AutoPlaceObject( pSoldier, &gTempObject, TRUE ) ) if ( gTempObject.exists() && !AutoPlaceObject( pSoldier, &gTempObject, TRUE ) )
{ {
// error msg! // error msg!
return( FALSE ); return( FALSE );
@@ -7694,7 +7699,7 @@ UINT16 FindReplacementMagazine( UINT8 ubCalibre, UINT16 ubMagSize, UINT8 ubAmmoT
while ( Magazine[usLoop].ubCalibre != NOAMMO ) while ( Magazine[usLoop].ubCalibre != NOAMMO )
{ {
// Flugente: problems arise if we cannot find a mag that fits exactly. Vanilla code then compromises on ammotype - which leads to loading from a AP belt resulting in HP mags. // Flugente: problems arise if we cannot find a mag that fits exactly. Vanilla code then compromises on ammotype - which leads to loading from a AP belt resulting in HP mags.
// As that's rather silly, we instead of compromis on mag size // As that's rather silly, we instead compromise on mag size
if ( Magazine[usLoop].ubCalibre == ubCalibre && Magazine[usLoop].ubAmmoType == ubAmmoType ) if ( Magazine[usLoop].ubCalibre == ubCalibre && Magazine[usLoop].ubAmmoType == ubAmmoType )
{ {
if ( Magazine[usLoop].ubMagSize == ubMagSize ) if ( Magazine[usLoop].ubMagSize == ubMagSize )