Fix bug if vehicle holds more soldiers than can fit in a squad (by Seven) (#101)

We would fail Assert(fSuccess) as all passengers would not fit in one squad, and the code wouldn't allow creating a new squad where they could be placed.
This commit is contained in:
Asdow
2023-01-20 16:24:18 +02:00
committed by GitHub
parent fc0182118c
commit 46c4ac2b64
+7
View File
@@ -2141,6 +2141,13 @@ void PutNonSquadMercsInPlayerGroupOnSquads( GROUP *pGroup, BOOLEAN fExitVehicles
// because if this is a simultaneous group attack, the mercs could be coming from different sides, and the
// placement screen can't handle mercs on the same squad arriving from difference edges!
fSuccess = AddCharacterToSquad( pSoldier, bUniqueVehicleSquad );
{
bUniqueVehicleSquad = GetFirstEmptySquad();
if (bUniqueVehicleSquad != -1)
{
fSuccess = AddCharacterToSquad(pSoldier, bUniqueVehicleSquad);
}
}
}
//CHRISL: So what's supposed to happen in the merc is assigned to a vehicle but fExitVehicles is FALSE?
else