From 4fdf0570d42067754e754486bd669b16819e0fa9 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Wed, 23 Jan 2013 13:09:00 +0000
Subject: [PATCH] Fixed M.E.R.C hiring (by Buggler) - Fixed CTD on MERC hiring
 by calling ETA msg box later in MERC main page due to optional gear msg box

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5808 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Laptop/mercs Files.cpp | Bin 143344 -> 142888 bytes
 Laptop/mercs.cpp       |   5 +++++
 2 files changed, 5 insertions(+)

diff --git a/Laptop/mercs Files.cpp b/Laptop/mercs Files.cpp
index 6523a97ba56fa5440205b2319863bdf6f8ed4aa9..7b9d0f638ee040b71053047bacbf5114c69f25ff 100644
GIT binary patch
delta 18
ZcmexxpJT-xj)oS-Elg5+(>bCU`2bF#25<lX

delta 315
zcmXAky-EW?6ot=(6kCaCmujpuDYO-=BG?&F{7EU3AG2z*37hq&w6Is$Vqd{l@e!=-
z(hI>i@Dcpx$}rqBXYPDw?(28*yG$OR+()gkU9K#X>gC+k%iZ_Y;~=k@rtDj`*F<xT
zs6D&~YN4UVtSe>a7fNwF-E(S=x;H071$qWm=hAIdU#V+UpEb93ab)l_;QNL=06PO1
z4Ec}k7^<%}z#RXM+p!Mm@1qKwDd={@>y*=k{w)G`)G8NmC*2mxtEoNnq8{*K$QLth
j@;;6cbb}Lz4P*pk#Nl$fJhW@eh-oRe8Trlf=Xw1Ph#W(-

diff --git a/Laptop/mercs.cpp b/Laptop/mercs.cpp
index 715fafec..13024c05 100644
--- a/Laptop/mercs.cpp
+++ b/Laptop/mercs.cpp
@@ -30,6 +30,7 @@
 	#include "Soldier Profile.h"
 	#include "Game Event Hook.h"
 	#include "Quests.h"
+	#include "AimMembers.h"
 #endif
 
 #ifdef JA2UB
@@ -508,6 +509,10 @@ BOOLEAN EnterMercs()
 
 	gfJustEnteredMercSite = TRUE;
 
+	//Display a popup msg box telling the user when and where the merc will arrive after hire
+	if( gfJustHiredAMercMerc == TRUE )
+		DisplayPopUpBoxExplainingMercArrivalLocationAndTime();
+
 	//if NOT entering from a subsite
 	if( gubArrivedFromMercSubSite == MERC_CAME_FROM_OTHER_PAGE )
 	{