From 1e06d2a7259e94895108c04da5703cf721be6363 Mon Sep 17 00:00:00 2001
From: silversurfer <silversurfer@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Thu, 19 Sep 2013 16:57:53 +0000
Subject: [PATCH] Bugfix for merc availability on M.E.R.C

When loading a savegame mercs that became available automatically where not enabled because they couldn't meet a condition anymore. This condition will not be checked anymore because it is not needed for functionality.

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

diff --git a/Laptop/mercs.cpp b/Laptop/mercs.cpp
index 14bda3671..561cdf46b 100644
--- a/Laptop/mercs.cpp
+++ b/Laptop/mercs.cpp
@@ -422,7 +422,10 @@ void RevaluateMercArray()
 	// check how many mercs are supposed to be available
 	for(i=0; i<NUM_PROFILES; i++)
 	{
-		if ( gConditionsForMercAvailability[i].StartMercsAvailable == TRUE && gConditionsForMercAvailability[i].NewMercsAvailable == FALSE )
+		// silversurfer: When a merc becomes available after money and time "NewMercsAvailable" is set to TRUE for him and saved to the savegame
+		// Therefore we should not check here if this tag is FALSE because it can't be false for him. "StartMercsAvailable" is also set to TRUE
+		// when he becomes available so we check only for this tag.
+		if ( gConditionsForMercAvailability[i].StartMercsAvailable == TRUE ) // && gConditionsForMercAvailability[i].NewMercsAvailable == FALSE )
 			NUMBER_OF_BAD_MERCS = NUMBER_OF_BAD_MERCS + 1;
 	}