From 33f3fefc3b51d17bad0bb59124855a85061a5a11 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Thu, 29 Nov 2012 14:44:16 +0000
Subject: [PATCH] - Bugfix: Fixed assertion error when dismissing a vehicle (by
 Realist)

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

diff --git a/Strategic/Merc Contract.cpp b/Strategic/Merc Contract.cpp
index 9bd697d2a..c5b8b7f65 100644
--- a/Strategic/Merc Contract.cpp	
+++ b/Strategic/Merc Contract.cpp	
@@ -930,6 +930,11 @@ BOOLEAN StrategicRemoveMerc( SOLDIERTYPE *pSoldier )
 		SetupProfileInsertionDataForSoldier( pSoldier );
 	}
 
+	if (IsVehicle(pSoldier))
+	{
+		// for some reason, vehicles have their own idea of handling group ids
+		RemovePlayerFromGroup(pVehicleList[ pSoldier->bVehicleID ].ubMovementGroup, pSoldier);
+	}
 	//remove him from the soldier structure
 	if( pSoldier->bAssignment >= ON_DUTY )
 	{