- To make it easier to search for dialogue and understand what a line is supposed to mean, changed a few dialogue enums.

- Merged IsMercOnTeam...(...) functions into one
- Fix: during hiring, AIM mercs only complained about their hated ones if these were already in the country, thus ignoring other mercs in transit


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8512 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Strategic/Strategic Merc Handler.cpp

@@ -412,7 +412,7 @@ void MercDailyUpdate()
 	// WANNE: Only send mails from the original 1.13 merc, and not from the wildfire merc,
 	// otherwise we get wrong mails cause of hardcoded Email.edt structure!!!!!	
 	UINT16 numOriginalProfiles = 255;
-	for( cnt = 0; cnt < numOriginalProfiles; cnt++)
+	for( cnt = 0; cnt < numOriginalProfiles; ++cnt)
 	{
 		pProfile = &(gMercProfiles[ cnt ]);
 
@@ -426,7 +426,7 @@ void MercDailyUpdate()
 		pProfile->uiPrecedentQuoteSaid = 0;
 
 		// skip anyone currently on the player's team
-		if ( IsMercOnTeam( (UINT8) cnt ))
+		if ( IsMercOnTeam( (UINT8) cnt, FALSE, FALSE ))
 		{
 			continue;
 		}