From e646ffda20667aee2c5186f96131e0ca29d9c3fc Mon Sep 17 00:00:00 2001
From: ChrisL <ChrisL@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Thu, 8 Jan 2009 16:53:45 +0000
Subject: [PATCH] Resolved an assertion error that occurs when retreating from
 a sector while inside a vehicle.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2474 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Strategic/PreBattle Interface.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Strategic/PreBattle Interface.cpp b/Strategic/PreBattle Interface.cpp
index 1026d9e8..30945499 100644
--- a/Strategic/PreBattle Interface.cpp	
+++ b/Strategic/PreBattle Interface.cpp	
@@ -1789,6 +1789,9 @@ void PutNonSquadMercsInPlayerGroupOnSquads( GROUP *pGroup, BOOLEAN fExitVehicles
 						// placement screen can't handle mercs on the same squad arriving from difference edges!
 						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
 				{