From 1a1d1fe54df7a21e6c2d5a58ad7b06c8cc389740 Mon Sep 17 00:00:00 2001
From: Shadooow <Shadooow@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Tue, 25 May 2021 08:11:50 +0000
Subject: [PATCH] fix: subsequent helicopter animation drops in Omerta will now
 work correctly (if saved before arrival, restarted game and then loaded, this
 resulted in helicopter now showing up and merc spawned into wall which bugged
 the game completely)

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

diff --git a/Tactical/Merc Hiring.cpp b/Tactical/Merc Hiring.cpp
index 53aed4e9a..372b88e33 100644
--- a/Tactical/Merc Hiring.cpp	
+++ b/Tactical/Merc Hiring.cpp	
@@ -11,7 +11,7 @@
 	#include "worlddef.h"
 	#include "renderworld.h"
 	#include "Assignments.h"
-
+	#include "merc entering.h"
 	#include "Animation Control.h"
 	#include "Animation Data.h"
 	#include "Isometric Utils.h"
@@ -513,6 +513,7 @@ void MercArrivesCallback(	UINT8	ubSoldierID )
 		#endif
 		{
 			gfTacticalDoHeliRun = TRUE;
+			SetHelicopterDroppoint(gGameExternalOptions.iInitialMercArrivalLocation);
 
 			// OK, If we are in mapscreen, get out...
 			if ( guiCurrentScreen == MAP_SCREEN )