From 201fcf4001f4bc95ac958558d542e7efcdf8806a Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sat, 22 Feb 2014 16:44:15 +0000
Subject: [PATCH] Merged from revision: 6961 - Bugfix: John Kulba (and other
 NPCs) did not show up on MERC website even if MERC_WEBSITE_ALL_MERC_AVAILABLE
  = TRUE (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6962 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Laptop/mercs.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Laptop/mercs.cpp b/Laptop/mercs.cpp
index 63828926..b5972ca3 100644
--- a/Laptop/mercs.cpp
+++ b/Laptop/mercs.cpp
@@ -3094,7 +3094,9 @@ void ShouldAnyNewMercMercBecomeAvailable()
 	//Kaiden: Added this if test to make sure that the "New Mercs Available"
 	// e-mail doesn't show up and no unneccessary checks are made when you
 	// have the ALL_MERCS_AT_MERC set to TRUE in the INI file.
-	if(!gGameExternalOptions.fAllMercsAvailable)
+	// anv: ALL_MERCS_AT_MERC doesn't cover mercs that can be unlocked depending on in-campaign conditions (e.g. Kulba)
+	// if ALL_MERCS_AT_MERC is on, .StartMercsAvailable = TRUE anyway, so there won't be any conflicts or unnecessary emails
+	//if(!gGameExternalOptions.fAllMercsAvailable)
 	{
 		for(UINT8 i=0; i<NUM_PROFILES; i++)
 		{
@@ -3130,11 +3132,10 @@ BOOLEAN CanMercBeAvailableYet( UINT8 ubMercToCheck )
 		if(gGameExternalOptions.fEnableRecruitableJohnKulba == TRUE)
 		{
 			if( LaptopSaveInfo.bJohnEscorted == TRUE
-				&& LaptopSaveInfo.uiJohnEscortedDate + gGameExternalOptions.ubRecruitableJohnKulbaDelay < GetWorldDay() )
+				&& LaptopSaveInfo.uiJohnEscortedDate + gGameExternalOptions.ubRecruitableJohnKulbaDelay <= GetWorldDay() )
 			{
 				return( TRUE );
-			}
-			else
+			}			else
 			{
 				return( FALSE );
 			}