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.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 )
 	{