From d1ec359600ddc2f0fad9d3e85ca8a0dc60d0990f Mon Sep 17 00:00:00 2001 From: Flugente Date: Sun, 22 Aug 2021 18:55:43 +0000 Subject: [PATCH] Fix: missing pointer check git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9152 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Soldier Init List.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tactical/Soldier Init List.cpp b/Tactical/Soldier Init List.cpp index 8f660195..ad719347 100644 --- a/Tactical/Soldier Init List.cpp +++ b/Tactical/Soldier Init List.cpp @@ -1671,7 +1671,7 @@ void AddSoldierInitListMilitia( UINT8 ubNumGreen, UINT8 ubNumRegs, UINT8 ubNumEl // silversurfer: Replace body type. Militia tanks are not allowed. if( curr->pBasicPlacement->fDetailedPlacement ) { - if ( ARMED_VEHICLE( curr->pDetailedPlacement ) ) + if ( curr->pDetailedPlacement && ARMED_VEHICLE( curr->pDetailedPlacement ) ) { curr->pBasicPlacement->ubBodyType = PreRandom( REGFEMALE + 1 ); // 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; } } - else if ( ARMED_VEHICLE( curr->pBasicPlacement ) ) + else if ( curr->pBasicPlacement && ARMED_VEHICLE( curr->pBasicPlacement ) ) { curr->pBasicPlacement->ubBodyType = PreRandom( REGFEMALE + 1 ); // check for better spot next to the tank so the militia doesn't get stuck in the tank