From 12f0ed5554809ccce13796285a8c93d233e9b965 Mon Sep 17 00:00:00 2001 From: Wanne Date: Tue, 2 Jun 2009 13:19:33 +0000 Subject: [PATCH] Externalized new messages for the Real-Time Mode git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2926 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Turn Based Input.cpp | 8 ++++---- Tactical/opplist.cpp | 2 +- Utils/Text.h | 5 +++++ Utils/_ChineseText.cpp | 7 +++++++ Utils/_DutchText.cpp | 7 +++++++ Utils/_EnglishText.cpp | 7 +++++++ Utils/_FrenchText.cpp | 7 +++++++ Utils/_GermanText.cpp | 9 ++++++++- Utils/_ItalianText.cpp | 7 +++++++ Utils/_PolishText.cpp | 7 +++++++ Utils/_RussianText.cpp | 7 +++++++ Utils/_TaiwaneseText.cpp | 7 +++++++ 12 files changed, 74 insertions(+), 6 deletions(-) diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp index 413f95dd..25aceec6 100644 --- a/Tactical/Turn Based Input.cpp +++ b/Tactical/Turn Based Input.cpp @@ -2374,14 +2374,14 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) if( gTacticalStatus.uiFlags & INCOMBAT ) { // Don't allow this in combat if (!gGameExternalOptions.fQuietRealTimeSneak) - ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"In combat already !"); + ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, New113Message[MSG113_RTM_IN_COMBAT_ALREADY]); fSneakingInRealTime = false; } if( WeSeeNoOne() ) { // Don't allow this if no enemies are seen - we have the forced turn mode for that if (!gGameExternalOptions.fQuietRealTimeSneak) - ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"No enemies in sight !"); + ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, New113Message[MSG113_RTM_NO_ENEMIES]); fSneakingInRealTime = false; } @@ -2397,7 +2397,7 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) if (gGameExternalOptions.fAllowRealTimeSneak) { gGameExternalOptions.fAllowRealTimeSneak = false; - ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Real-time sneaking OFF"); + ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, New113Message[MSG113_RTM_SNEAKING_OFF]); if( !WeSeeNoOne() ) // if we're sneaking up on someone, enter turn-based EnterCombatMode(OUR_TEAM); @@ -2405,7 +2405,7 @@ void GetKeyboardInput( UINT32 *puiNewEvent ) else { gGameExternalOptions.fAllowRealTimeSneak = true; - ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Real-time sneaking ON"); + ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, New113Message[MSG113_RTM_SNEAKING_ON]); } } diff --git a/Tactical/opplist.cpp b/Tactical/opplist.cpp index 440f59ba..5229d20b 100644 --- a/Tactical/opplist.cpp +++ b/Tactical/opplist.cpp @@ -494,7 +494,7 @@ void HandleBestSightingPositionInRealtime( void ) SelectSoldier (MercPtrs[gubBestToMakeSighting[ 0 ]]->ubID, false, true); // if not quiet, emit a message warning the player if (!gGameExternalOptions.fQuietRealTimeSneak) - ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Enemy spotted! (ctrl-x to enter turn based)"); + ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, New113Message[MSG113_RTM_ENEMIES_SPOOTED]); return; // and do nothing } diff --git a/Utils/Text.h b/Utils/Text.h index 8597a8f0..15c5f0ea 100644 --- a/Utils/Text.h +++ b/Utils/Text.h @@ -1680,6 +1680,11 @@ enum MSG113_SOLD, MSG113_SOLD_ALL, MSG113_CHECK_GOGGLES, + MSG113_RTM_IN_COMBAT_ALREADY, + MSG113_RTM_NO_ENEMIES, + MSG113_RTM_SNEAKING_OFF, + MSG113_RTM_SNEAKING_ON, + MSG113_RTM_ENEMIES_SPOOTED, }; //CHRISL: NewInv messages diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index 8163404d..d312558c 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -4527,6 +4527,12 @@ STR16 New113Message[] = L"物品卖出", L"此类物品全部卖出", L"你得检查一下你的眼部装备", + // Real Time Mode messages + L"In combat already", + L"No enemies in sight", + L"Real-time sneaking OFF", + L"Real-time sneaking ON", + L"Enemy spotted! (Ctrl + x to enter turn based)", }; STR16 New113HAMMessage[] = @@ -4676,6 +4682,7 @@ STR16 MPClientMessage[] = // 65 L"点击 '准备' 进入战术画面。",// L"Press 'Ready' to enter tactical screen.", L"Cannot connect because your version %S is different from the server version %S.", + L"You killed an enemy soldier.", }; STR16 MPHelp[] = diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index 9c83f1fb..1c7822dd 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -4514,6 +4514,12 @@ STR16 New113Message[] = L"Verkocht punt", L"Verkocht alle punten van dit type", L"You should check your goggles", + // Real Time Mode messages + L"In combat already", + L"No enemies in sight", + L"Real-time sneaking OFF", + L"Real-time sneaking ON", + L"Enemy spotted! (Ctrl + x to enter turn based)", }; STR16 New113HAMMessage[] = @@ -4662,6 +4668,7 @@ STR16 MPClientMessage[] = // 65 L"Press 'Ready' to enter tactical screen.", L"Cannot connect because your version %S is different from the server version %S.", + L"You killed an enemy soldier.", }; STR16 MPHelp[] = diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 116feb65..bcf8d02c 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -4527,6 +4527,12 @@ STR16 New113Message[] = L"Sold item", L"Sold all items of this type", L"You should check your goggles", + // Real Time Mode messages + L"In combat already", + L"No enemies in sight", + L"Real-time sneaking OFF", + L"Real-time sneaking ON", + L"Enemy spotted! (Ctrl + x to enter turn based)", }; STR16 New113HAMMessage[] = @@ -4676,6 +4682,7 @@ STR16 MPClientMessage[] = // 65 L"Press 'Ready' to enter tactical screen.", L"Cannot connect because your version %S is different from the server version %S.", + L"You killed an enemy soldier.", }; STR16 MPHelp[] = diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index d7f1e479..fcff1eb3 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -4527,6 +4527,12 @@ STR16 New113Message[] = L"Article vendu", L"A vendu tous les articles de ce type", L"Vous devriez vrifier votre accessoire de vision", + // Real Time Mode messages + L"In combat already", + L"No enemies in sight", + L"Real-time sneaking OFF", + L"Real-time sneaking ON", + L"Enemy spotted! (Ctrl + x to enter turn based)", }; STR16 New113HAMMessage[] = @@ -4676,6 +4682,7 @@ STR16 MPClientMessage[] = // 65 L"Press 'Ready' to enter tactical screen.", L"Cannot connect because your version %S is different from the server version %S.", + L"You killed an enemy soldier.", }; STR16 MPHelp[] = diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index 13b09194..90332654 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -3689,7 +3689,7 @@ STR16 gzMPHScreenText[] = L"Max. Spieleranzahl muss zwischen 2 und 4 sein.", L"Teamgre muss zwischen 1 und 5 sein.", L"Tageszeit", - L"Tageszeit muss eine 24h Zeit (SS:MM) sein., + L"Tageszeit muss eine 24h Zeit (SS:MM) sein.", L"Startkapital muss ein gltiger Dollerwert (keine Cents) sein." , L"Schaden Multiplikator", L"Schaden Multiplikator muss zwischen 0 and 5 sein.", @@ -4322,6 +4322,12 @@ STR16 New113Message[] = L"Gegestand verkauft.", L"Alle Gegenstnde dieses Typs verkauft.", L"Sie sollten Ihre Brillen prfen!", + // Real Time Mode messages + L"Sie sind bereits im Kampfmodus", + L"Keine Gegner in Sicht", + L"Echtzeit Schleichmodus AUS", + L"Echtzeit Schleichmodus AN", + L"Gegner gesichtet! (Ctrl + x fr Rundenmodus)", }; STR16 New113HAMMessage[] = @@ -4469,6 +4475,7 @@ STR16 MPClientMessage[] = // 65 L"Drcken Sie 'Bereit' um in den taktischen Bildschirm zu gelangen.", L"Kann keine Verbindung herstellen, weil Ihre Version %S unterschiedlich zur Server Version %S ist.", + L"Sie haben einen gegnerischen Soldaten gettet.", }; STR16 MPHelp[] = diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 47a73a31..ea0a1a04 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -4512,6 +4512,12 @@ STR16 New113Message[] = L"Articolo venduto", L"Ha venduto tutti gli articoli di questo tipo", L"You should check your goggles", + // Real Time Mode messages + L"In combat already", + L"No enemies in sight", + L"Real-time sneaking OFF", + L"Real-time sneaking ON", + L"Enemy spotted! (Ctrl + x to enter turn based)", }; STR16 New113HAMMessage[] = @@ -4660,6 +4666,7 @@ STR16 MPClientMessage[] = // 65 L"Press 'Ready' to enter tactical screen.", L"Cannot connect because your version %S is different from the server version %S.", + L"You killed an enemy soldier.", }; STR16 MPHelp[] = diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index dfaac984..5d87556e 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -4517,6 +4517,12 @@ STR16 New113Message[] = L"Przedmiot sprzedany", L"Wszystkie przedmioty tego typu sprzedane", L"Sprawd swoje gogle", + // Real Time Mode messages + L"In combat already", + L"No enemies in sight", + L"Real-time sneaking OFF", + L"Real-time sneaking ON", + L"Enemy spotted! (Ctrl + x to enter turn based)", }; STR16 New113HAMMessage[] = @@ -4665,6 +4671,7 @@ STR16 MPClientMessage[] = // 65 L"Press 'Ready' to enter tactical screen.", L"Cannot connect because your version %S is different from the server version %S.", + L"You killed an enemy soldier.", }; STR16 MPHelp[] = diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 1ed159f7..ec4e4ea5 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -4522,6 +4522,12 @@ STR16 New113Message[] = L" .", L" .", L" .", //You should check your goggles + // Real Time Mode messages + L"In combat already", + L"No enemies in sight", + L"Real-time sneaking OFF", + L"Real-time sneaking ON", + L"Enemy spotted! (Ctrl + x to enter turn based)", }; STR16 New113HAMMessage[] = @@ -4671,6 +4677,7 @@ STR16 MPClientMessage[] = // 65 L" '' .", //Press 'Ready' to enter tactical screen. L" . (%S) (%S).", //Cannot connect because your version %S is different from the server version %S. + L"You killed an enemy soldier.", }; STR16 MPHelp[] = diff --git a/Utils/_TaiwaneseText.cpp b/Utils/_TaiwaneseText.cpp index 39263a8f..2b3990b5 100644 --- a/Utils/_TaiwaneseText.cpp +++ b/Utils/_TaiwaneseText.cpp @@ -4525,6 +4525,12 @@ STR16 New113Message[] = L"Sold item", L"Sold all items of this type", L"You should check your goggles", + // Real Time Mode messages + L"In combat already", + L"No enemies in sight", + L"Real-time sneaking OFF", + L"Real-time sneaking ON", + L"Enemy spotted! (Ctrl + x to enter turn based)", }; STR16 New113HAMMessage[] = @@ -4673,6 +4679,7 @@ STR16 MPClientMessage[] = // 65 L"Press 'Ready' to enter tactical screen.", L"Cannot connect because your version %S is different from the server version %S.", + L"You killed an enemy soldier.", }; STR16 MPHelp[] =