mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
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:
@@ -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
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user