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

Resolved an assertion error that occurs when retreating from a sector while inside a vehicle.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2474 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
ChrisL
2009-01-08 16:53:45 +00:00
parent ddd90f5317
commit e646ffda20
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/PreBattle Interface.cpp
+3
View File
@@ -1789,6 +1789,9 @@ void PutNonSquadMercsInPlayerGroupOnSquads( GROUP *pGroup, BOOLEAN fExitVehicles
// 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 );
} }
//CHRISL: So what's supposed to happen in the merc is assigned to a vehicle but fExitVehicles is FALSE?
else
fSuccess = TRUE;
} }
else else
{ {