- Fixed MERC hiring bug when reached max allowed mercs due to optional gear feature (by Buggler)

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

MPHostScreen.cpp

@@ -2863,4 +2863,4 @@ void RenderMPHSmallSelectionFrame(INT16 sX, INT16 sY)
 	BltVideoObject(FRAME_BUFFER, hHandle, 0, sX, sY , VO_BLT_SRCTRANSPARENCY,NULL);
 
 	return;
-}
+}

Utils/_ChineseText.cpp

@@ -4244,7 +4244,7 @@ STR16			MercInfo[] =
 	L"合计: ",	//"Total:",
 	L"阵亡",	//"Deceased",
 
-	L"看起来你雇佣了太多的佣兵。最多只能雇18人。",	//"Looks like you're trying to hire too many mercs. Your limit is 18.",
+	L"你的队伍已经满员了。",
 	L"购买装备？",	//"Buy Equipment?",	
 	L"不可雇佣",	//"Unavailable",
 	L"Unsettled Bills", //TODO.Translate
@@ -4745,7 +4745,7 @@ STR16			AimPopUpText[] =
 
 	//If you try to hire more mercs than game can support
 
-	L"你的队伍现有18人，已经满员了。",	//"You have a full team of 18 mercs already.",
+	L"你的队伍已经满员了。",
 
 	L"预录消息",	//"Pre-recorded message",
 	L"留言已记录",	//"Message recorded",

Utils/_DutchText.cpp

@@ -4247,7 +4247,7 @@ STR16			MercInfo[] =
 	L"Totaal:",
 	L"Overleden",
 
-	L"Lijkt erop dat je teveel huurlingen wil recruteren. Limiet is 18.",
+	L"Je team bestaat al uit huurlingen.",
 	L"Koop Uitrusting?",
 	L"Niet beschikbaar",
 	L"Unsettled Bills", //TODO.Translate

Utils/_EnglishText.cpp

@@ -4245,7 +4245,7 @@ STR16			MercInfo[] =
 	L"Total:",
 	L"Deceased",
 
-	L"Looks like you're trying to hire too many mercs. Your limit is 18.",
+	L"You have a full team of mercs already.",
 	L"Buy Equipment?",
 	L"Unavailable",
 	L"Unsettled Bills",

Utils/_FrenchText.cpp

@@ -4247,7 +4247,7 @@ STR16			MercInfo[] =
 	L"Total :",		// TODO.Translate
 	L"Décédé(e)",
 
-	L"Vous ne pouvez engager plus de 18 mercenaires.",
+	L"Équipe de mercenaires déjà au complet.",
 	L"Acheter équipement ?",	// TODO.Translate
 	L"Indisponible",											
 	L"Unsettled Bills", //TODO.Translate

Utils/_GermanText.cpp

@@ -4170,7 +4170,7 @@ STR16 MercInfo[] =
 	L"Gesamt:",
 	L"Verstorben",	
 
-	L"Sie versuchen, zu viele Söldner anzuheuern. Sie haben die Maximalanzahl erreicht.",
+	L"Sie haben bereits ein vollständiges Team.",
 	L"Ausrüstung kaufen?",
 	L"nicht da",
 	L"Offene Beträge",

Utils/_ItalianText.cpp

@@ -4234,7 +4234,7 @@ STR16			MercInfo[] =
 	L"Totale:",
 	L"Deceduto",
 
-	L"Sembra che state arruolando troppi mercenari. Il vostro limite è di 18.",
+	L"Avete già una squadra di mercenari.",
 	L"Compra equip.?",
 	L"Non disponibile",
 	L"Unsettled Bills", //TODO.Translate

Utils/_PolishText.cpp

@@ -4248,7 +4248,7 @@ STR16			MercInfo[] =
 	L"Razem:",
 	L"Nie żyje",
 
-	L"Wygląda na to, że chcesz wynająć zbyt wielu najemników. Limit wynosi 18.",
+	L"You have a full team of mercs already.", //TODO.Translate
 	L"Weź sprzęt?",
 	L"Niedostępny",
 	L"Unsettled Bills", //TODO.Translate
@@ -4749,7 +4749,7 @@ STR16			AimPopUpText[] =
 
 	//If you try to hire more mercs than game can support
 
-	L"You have a full team of mercs already.",
+	L"You have a full team of mercs already.", //TODO.Translate
 
 	L"Nagrana wiadomość",
 	L"Wiadomość zapisana",

Utils/_RussianText.cpp

@@ -4243,7 +4243,7 @@ STR16			MercInfo[] =
 	L"Всего:",
 	L"Погиб",
 
-	L"Похоже, вы пытаетесь нанять более 18 наемников, а это недопустимо.",
+	L"У вас уже полная команда из наемников.",
 	L"Со снаряжением?",
 	L"Недоступно",
 	L"Unsettled Bills", //TODO.Translate

Utils/_TaiwaneseText.cpp

@@ -4248,7 +4248,7 @@ STR16			MercInfo[] =
 	L"Total:",
 	L"Deceased",
 
-	L"Looks like you're trying to hire too many mercs. Your limit is 18.",
+	L"You have a full team of mercs already.",
 	L"Buy Equipment?",
 	L"Unavailable",
 	L"Unsettled Bills",