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

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

Browse Source 
This reverts commit 46c4ac2b64.
This commit is contained in:
Asdow
2023-01-20 16:48:27 +02:00
committed by GitHub
parent 46c4ac2b64
commit f0d0ba7307
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/PreBattle Interface.cpp
-7
View File
@@ -2141,13 +2141,6 @@ void PutNonSquadMercsInPlayerGroupOnSquads( GROUP *pGroup, BOOLEAN fExitVehicles
// because if this is a simultaneous group attack, the mercs could be coming from different sides, and the // 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! // placement screen can't handle mercs on the same squad arriving from difference edges!
fSuccess = AddCharacterToSquad( pSoldier, bUniqueVehicleSquad ); 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? //CHRISL: So what's supposed to happen in the merc is assigned to a vehicle but fExitVehicles is FALSE?
else else