From f60a8b21205b01cbb3e9de50ac7b06f4f8a8eba8 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Tue, 12 Nov 2013 18:08:45 +0000
Subject: [PATCH] Fix: first gamestart helidrop after starting exe had wrong
 dropoff gridno

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6590 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/Merc Entering.cpp | 6 ------
 gamescreen.cpp             | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Tactical/Merc Entering.cpp b/Tactical/Merc Entering.cpp
index 0ba37b2e..c49b3009 100644
--- a/Tactical/Merc Entering.cpp	
+++ b/Tactical/Merc Entering.cpp	
@@ -882,12 +882,6 @@ void HandleFirstHeliDropOfGame( )
 	// Are we in the first heli drop?
 	if ( gfFirstHeliRun )
 	{
-#ifdef JA2UB
-		SetHelicopterDroppoint( gGameUBOptions.LOCATEGRIDNO );
-#else
-		SetHelicopterDroppoint( gGameExternalOptions.iInitialMercArrivalLocation );
-#endif
-
 		SyncStrategicTurnTimes();
 
 		// Move to header file...
diff --git a/gamescreen.cpp b/gamescreen.cpp
index b2db6790..6211ac1f 100644
--- a/gamescreen.cpp
+++ b/gamescreen.cpp
@@ -1210,6 +1210,12 @@ void InitHelicopterEntranceByMercs( void )
 		gfTacticalDoHeliRun = TRUE;
 		gfFirstHeliRun			= TRUE;
 
+#ifdef JA2UB
+		SetHelicopterDroppoint( gGameUBOptions.LOCATEGRIDNO );
+#else
+		SetHelicopterDroppoint( gGameExternalOptions.iInitialMercArrivalLocation );
+#endif
+
 		gTacticalStatus.fDidGameJustStart = FALSE;
 	}
 }