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

Fix: missing pointer check

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9152 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2021-08-22 18:55:43 +00:00
parent 6f5e2471e0
commit d1ec359600
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Init List.cpp
+2 -2
View File
@@ -1671,7 +1671,7 @@ void AddSoldierInitListMilitia( UINT8 ubNumGreen, UINT8 ubNumRegs, UINT8 ubNumEl
// silversurfer: Replace body type. Militia tanks are not allowed. // silversurfer: Replace body type. Militia tanks are not allowed.
if( curr->pBasicPlacement->fDetailedPlacement ) if( curr->pBasicPlacement->fDetailedPlacement )
{ {
if ( ARMED_VEHICLE( curr->pDetailedPlacement ) ) if ( curr->pDetailedPlacement && ARMED_VEHICLE( curr->pDetailedPlacement ) )
{ {
curr->pBasicPlacement->ubBodyType = PreRandom( REGFEMALE + 1 ); curr->pBasicPlacement->ubBodyType = PreRandom( REGFEMALE + 1 );
// check for better spot next to the tank so the militia doesn't get stuck in the tank // check for better spot next to the tank so the militia doesn't get stuck in the tank
@@ -1680,7 +1680,7 @@ void AddSoldierInitListMilitia( UINT8 ubNumGreen, UINT8 ubNumRegs, UINT8 ubNumEl
curr->pBasicPlacement->usStartingGridNo = iNewSpot; curr->pBasicPlacement->usStartingGridNo = iNewSpot;
} }
} }
else if ( ARMED_VEHICLE( curr->pBasicPlacement ) ) else if ( curr->pBasicPlacement && ARMED_VEHICLE( curr->pBasicPlacement ) )
{ {
curr->pBasicPlacement->ubBodyType = PreRandom( REGFEMALE + 1 ); curr->pBasicPlacement->ubBodyType = PreRandom( REGFEMALE + 1 );
// check for better spot next to the tank so the militia doesn't get stuck in the tank // check for better spot next to the tank so the militia doesn't get stuck in the tank