From 3fb99cfb87bced5ffa1bea673c8a91aac0519af9 Mon Sep 17 00:00:00 2001
From: silversurfer <silversurfer@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sat, 12 Mar 2016 09:30:18 +0000
Subject: [PATCH] Moved INITIAL_MERC_ARRIVAL_LOCATION from Ja2_Options.ini to
 Mod_Settings.ini. If Mod_Settings.ini has a value defined it will overwrite
 the value from Ja2_Options.ini. Otherwise it will leave it alone.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8105 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 GameSettings.cpp |  4 ++++
 GameSettings.h   |  1 +
 GameVersion.cpp  | 16 ++++++++--------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/GameSettings.cpp b/GameSettings.cpp
index e6ca0f33..5b9406eb 100644
--- a/GameSettings.cpp
+++ b/GameSettings.cpp
@@ -2643,6 +2643,10 @@ void LoadModSettings(){
 	gModSettings.iLostShipmentGridNo = iniReader.ReadInteger("Bobby Ray", "LOST_SHIPMENT_GRIDNO", 2);
 
 	//[Omerta]
+	gModSettings.iInitialMercArrivalLocation = iniReader.ReadInteger("Omerta", "INITIAL_MERC_ARRIVAL_LOCATION", 0);
+	// silversurfer: If the mod has a dropoff tile defined use the mod value instead of the default from Ja2_Options.ini
+	if( gModSettings.iInitialMercArrivalLocation != 0 )
+		gGameExternalOptions.iInitialMercArrivalLocation = gModSettings.iInitialMercArrivalLocation;
 
 	//[Drassen]
 	gModSettings.ubCarmenGiveRewardSectorX = iniReader.ReadInteger("Drassen", "CARMEN_GIVE_REWARD_SECTOR_X", 13);
diff --git a/GameSettings.h b/GameSettings.h
index f906c190..41e8e8cf 100644
--- a/GameSettings.h
+++ b/GameSettings.h
@@ -2038,6 +2038,7 @@ typedef struct
 	INT32 iLostShipmentGridNo;
 
 	//[Omerta]
+	INT32 iInitialMercArrivalLocation;
 
 	//[Drassen]
 	//meet Carmen in sector for reward collection
diff --git a/GameVersion.cpp b/GameVersion.cpp
index d1439389..39a4e1b6 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -15,9 +15,9 @@
 #ifdef JA2EDITOR
 	
 	#ifdef JA2UB
-		CHAR16 zVersionLabel[256]		= { L"Unfinished Business - Map Editor v1.13.8103 (Development Build)" }; 
+		CHAR16 zVersionLabel[256]		= { L"Unfinished Business - Map Editor v1.13.8105 (Development Build)" }; 
 	#else
-		CHAR16 zVersionLabel[256]		= { L"Map Editor v1.13.8103 (Development Build)" }; 
+		CHAR16 zVersionLabel[256]		= { L"Map Editor v1.13.8105 (Development Build)" }; 
 	#endif
 
 // ------------------------------
@@ -27,11 +27,11 @@
 
 	//DEBUG BUILD VERSION	
 	#ifdef JA2UB
-		CHAR16 zVersionLabel[256]		= { L"Debug: Unfinished Business - v1.13.8103 (Development Build)" }; 
+		CHAR16 zVersionLabel[256]		= { L"Debug: Unfinished Business - v1.13.8105 (Development Build)" }; 
 	#elif defined (JA113DEMO)
-		CHAR16 zVersionLabel[256]		= { L"Debug: JA2 Demo - v1.13.8103 (Development Build)" }; 
+		CHAR16 zVersionLabel[256]		= { L"Debug: JA2 Demo - v1.13.8105 (Development Build)" }; 
 	#else
-		CHAR16 zVersionLabel[256]		= { L"Debug: v1.13.8103 (Development Build)" }; 
+		CHAR16 zVersionLabel[256]		= { L"Debug: v1.13.8105 (Development Build)" }; 
 	#endif
 
 #elif defined CRIPPLED_VERSION
@@ -46,11 +46,11 @@
 
 	//RELEASE BUILD VERSION	
 	#ifdef JA2UB
-		CHAR16		zVersionLabel[256]		= { L"Release Unfinished Business - v1.13.8103 (Development Build)" };
+		CHAR16		zVersionLabel[256]		= { L"Release Unfinished Business - v1.13.8105 (Development Build)" };
 	#elif defined (JA113DEMO)
-		CHAR16		zVersionLabel[256]		= { L"Release JA2 Demo - v1.13.8103 (Development Build)" };
+		CHAR16		zVersionLabel[256]		= { L"Release JA2 Demo - v1.13.8105 (Development Build)" };
 	#else
-		CHAR16		zVersionLabel[256]		= { L"Release v1.13.8103 (Development Build)" };
+		CHAR16		zVersionLabel[256]		= { L"Release v1.13.8105 (Development Build)" };
 	#endif
 
 #endif