- 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

Tactical/Dialogue Control.h

@@ -110,14 +110,14 @@ enum DialogQuoteIDs
 	//70
 	QUOTE_ENEMY_RETREATED,
 	QUOTE_GOING_TO_AUTO_SLEEP,
-	QUOTE_WORK_UP_AND_RETURNING_TO_ASSIGNMENT, // woke up from auto sleep, going back to wo
+	QUOTE_WORK_UP_AND_RETURNING_TO_ASSIGNMENT, // woke up from auto sleep, going back to work
 	QUOTE_ME_TOO, // me too quote, in agreement with whatever the merc previous said
 	QUOTE_USELESS_ITEM,
 	QUOTE_BOOBYTRAP_ITEM,
 	QUOTE_SUSPICIOUS_GROUND,
 	QUOTE_DROWNING,
 	QUOTE_MERC_REACHED_DESTINATION,
-	QUOTE_SPARE2,
+	QUOTE_JA2UB_LAPTOP_FIXED,			// JA2UB: played when the laptop is fixed
 
 	//80
 	QUOTE_REPUTATION_REFUSAL, //80
@@ -171,8 +171,8 @@ enum DialogQuoteIDs
 	QUOTE_IMPATIENT_QUOTE,					
 	QUOTE_LENGTH_OF_CONTRACT,
 	QUOTE_COMMENT_BEFORE_HANG_UP,
-	QUOTE_PERSONALITY_BIAS_WITH_HATED_1,
-	QUOTE_PERSONALITY_BIAS_WITH_HATED_2,
+	QUOTE_HATED_1_ON_TEAM_LONGTIMETOHATE,		// played when we refuse to be hired because hated person is present and hatetime >= 24 (else play QUOTE_HATED_1_ON_TEAM)
+	QUOTE_HATED_2_ON_TEAM_LONGTIMETOHATE,
 	QUOTE_MERC_LEAVING_ALSUCO_SOON,
 	QUOTE_MERC_GONE_UP_IN_PRICE,
 #ifdef JA2UB
@@ -210,9 +210,9 @@ enum DialogQuoteIDs
 	QUOTE_RENEWING_CAUSE_BUDDY_3_ON_TEAM,
 	QUOTE_RENEWING_CAUSE_BUDDY_4_ON_TEAM,
 	QUOTE_RENEWING_CAUSE_BUDDY_5_ON_TEAM,
-	QUOTE_PERSONALITY_BIAS_WITH_HATED_3,
-	QUOTE_PERSONALITY_BIAS_WITH_HATED_4,
-	QUOTE_PERSONALITY_BIAS_WITH_HATED_5,
+	QUOTE_HATED_3_ON_TEAM_LONGTIMETOHATE,
+	QUOTE_HATED_4_ON_TEAM_LONGTIMETOHATE,
+	QUOTE_HATED_5_ON_TEAM_LONGTIMETOHATE,
 };