Fix: crash when entering a sector if currently selected merc is in the helicopter

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7819 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2015-04-19 09:22:43 +00:00
parent 17fba036b0
commit 8fe526b0e5
+6 -1
View File
@@ -3180,7 +3180,12 @@ void InternalSelectSoldier( UINT16 usSoldierID, BOOLEAN fAcknowledge, BOOLEAN fF
// find which squad this guy is, then set selected squad to this guy
if( pSoldier->bAssignment == VEHICLE )
{
SetCurrentSquad( GetSoldierStructureForVehicle(pSoldier->iVehicleId)->bAssignment, FALSE );
SOLDIERTYPE* pVehicle = GetSoldierStructureForVehicle( pSoldier->iVehicleId );
if ( pVehicle )
SetCurrentSquad( pVehicle->bAssignment, FALSE );
else
SetCurrentSquad( pSoldier->bAssignment, FALSE );
}
else
{