From f7989a1fca51b3d7f65853d1144132510467927b Mon Sep 17 00:00:00 2001 From: Wanne Date: Mon, 13 May 2013 20:24:21 +0000 Subject: [PATCH] - 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 --- Laptop/mercs Files.cpp | Bin 142920 -> 142272 bytes MPHostScreen.cpp | 2 +- Utils/_ChineseText.cpp | 4 ++-- Utils/_DutchText.cpp | 2 +- Utils/_EnglishText.cpp | 2 +- Utils/_FrenchText.cpp | 2 +- Utils/_GermanText.cpp | 2 +- Utils/_ItalianText.cpp | 2 +- Utils/_PolishText.cpp | 4 ++-- Utils/_RussianText.cpp | 2 +- Utils/_TaiwaneseText.cpp | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Laptop/mercs Files.cpp b/Laptop/mercs Files.cpp index 96355017bdb742ebfed2ee4533d2629939b21117..f4571d4421529567b362c1c63471e7b57b9e6bba 100644 GIT binary patch delta 331 zcmX?chvUF?jtwIIn`8X-?56+Q!^kx~ONXg#dejX@zR3%^LZ&4#mQ4O}lyCY!9VV0M z2D(hMCLLp&eomLkVEP|jCWpy8jtflQH$!B4Lm8vg)Rm$aYWv)dcj9-*QHg>2GD7{=dc7?yF^7IF8Wu;D-<7No2#83ao~ke5=#gI&sDu|K%5-)`L!iCDG{ zOIjcCipYX>sH3{zC@i57p!gd zSU>;ThRvz-hLsqgJY^|Oqx49gK6)tkQMyL==&{T^-H^8{vy;xz6*@&WC%&M)($ybJ z@rHuMr3k{j=%RxsvRLQq3e7yIkmQ2GrQRlLqMLzGni@dqKRa!DbFGE9M9B-~(1FVD z$PF@1*YDF_GLQNNuKpDANEs&Yen5poFkiiv+~VP zN5?ZZ7yX1vreW!kjG1USA$}D_R67}yOEZ%9{+ww0W<}fLji}M;%X(H0XTjr#@^i{G zOfUWpB4dkj!dj)C3OP3oVzIZ~~YqB(T`xN45n@qwJvG!_(Y o;Vy3LgXfBCrxDSgHjA%UB6{g%k`LxEt&5XM-g=7^*R~P<3)>US0{{R3 diff --git a/MPHostScreen.cpp b/MPHostScreen.cpp index 19b60f011..305d25e54 100644 --- a/MPHostScreen.cpp +++ b/MPHostScreen.cpp @@ -2863,4 +2863,4 @@ void RenderMPHSmallSelectionFrame(INT16 sX, INT16 sY) BltVideoObject(FRAME_BUFFER, hHandle, 0, sX, sY , VO_BLT_SRCTRANSPARENCY,NULL); return; -} +} diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index c0c025053..f920d3868 100644 --- a/Utils/_ChineseText.cpp +++ b/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", diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index 1e5e625c6..6283b4cc4 100644 --- a/Utils/_DutchText.cpp +++ b/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 diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 82a759380..41dd9eeed 100644 --- a/Utils/_EnglishText.cpp +++ b/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", diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index 6238ca961..6fac1623c 100644 --- a/Utils/_FrenchText.cpp +++ b/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 diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index 45dde9ba7..d69a83f6d 100644 --- a/Utils/_GermanText.cpp +++ b/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", diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 6eb4493c5..466218c2d 100644 --- a/Utils/_ItalianText.cpp +++ b/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 diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index dd8aa7ebd..9b3e8e4e5 100644 --- a/Utils/_PolishText.cpp +++ b/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", diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index f1c7a0396..1e9870d65 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -4243,7 +4243,7 @@ STR16 MercInfo[] = L"Всего:", L"Погиб", - L"Похоже, вы пытаетесь нанять более 18 наемников, а это недопустимо.", + L"У вас уже полная команда из наемников.", L"Со снаряжением?", L"Недоступно", L"Unsettled Bills", //TODO.Translate diff --git a/Utils/_TaiwaneseText.cpp b/Utils/_TaiwaneseText.cpp index faaaf7fbf..bd96cf695 100644 --- a/Utils/_TaiwaneseText.cpp +++ b/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",