1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Replaced all "Jagged Alliance 2" strings to "Jagged Alliance 2 v1.13"

Browse Source 
- Added missing tooltip text for Enhanced Desription Box in the settings
- New Release build 2415

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2415 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2008-11-13 14:06:46 +00:00
parent 905ce20125
commit 59f652c6a2
15 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameVersion.cpp
+3 -3
View File
@@ -18,7 +18,7 @@ CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.2389" };
#elif defined JA2BETAVERSION
//BETA/TEST BUILD VERSION
CHAR16 zVersionLabel[256] = { L"Debug v1.13.2389" };
CHAR16 zVersionLabel[256] = { L"Debug v1.13.2415" };
#elif defined CRIPPLED_VERSION
@@ -28,11 +28,11 @@ CHAR16 zVersionLabel[256] = { L"Beta v. 0.98" };
#else
//RELEASE BUILD VERSION
CHAR16 zVersionLabel[256] = { L"Release v1.13.2389" };
CHAR16 zVersionLabel[256] = { L"Release v1.13.2415" };
#endif
CHAR8 czVersionNumber[16] = { "Build 08.10.30" }; //YY.MM.DD
CHAR8 czVersionNumber[16] = { "Build 08.11.13" }; //YY.MM.DD
CHAR16 zTrackingNumber[16] = { L"Z" };
Standard Gaming Platform/DEBUG.cpp
+1 -1
View File
@@ -540,7 +540,7 @@ void _FailMessage( STR8 pString, UINT32 uiLineNum, STR8 pSourceFile )
if( !FontObjs[0] )
{ //Font manager hasn't yet been initialized so use the windows error system
sprintf( gubErrorText, "Assertion Failure -- Line %d in %s", uiLineNum, pSourceFile );
MessageBox( NULL, gubErrorText, "Jagged Alliance 2", MB_OK );
MessageBox( NULL, gubErrorText, "Jagged Alliance 2 v1.13", MB_OK );
gfProgramIsRunning = FALSE;
return;
}
Standard Gaming Platform/video.cpp
+2 -2
View File
@@ -271,7 +271,7 @@ BOOLEAN InitializeVideoManager(HINSTANCE hInstance, UINT16 usCommandShow, void *
ptWindowSize.x = window.right;
ptWindowSize.y = window.bottom;
hWindow = CreateWindowEx(exstyle, (LPCSTR) ClassName, "Jagged Alliance 2", style, window.left, window.top, window.right, window.bottom, NULL, NULL, hInstance, NULL);
hWindow = CreateWindowEx(exstyle, (LPCSTR) ClassName, "Jagged Alliance 2 v1.13", style, window.left, window.top, window.right, window.bottom, NULL, NULL, hInstance, NULL);
GetClientRect( hWindow, &window);
window.top = window.top;
}
@@ -2806,7 +2806,7 @@ BOOLEAN GetRGBDistribution(void)
if (!gusRedMask)
{
MessageBox( NULL, "Jagged Alliance 2 windowed mode requires a color depth of 16bpp or less.", "Jagged Alliance 2", MB_ICONEXCLAMATION);
MessageBox( NULL, "Jagged Alliance 2 v1.13 windowed mode requires a color depth of 16bpp or less.", "Jagged Alliance 2 v1.13", MB_ICONEXCLAMATION);
PostQuitMessage(1);
return FALSE;
}
Strategic/Game Event Hook.cpp
+2 -2
View File
@@ -456,11 +456,11 @@ void CrippledVersionEndGameCheck()
if( guiDay >= 8 )
{
swprintf( zString, L"Game Over. We hope you have enjoyed playing the limited version of Jagged Alliance 2." );
swprintf( zString, L"Game Over. We hope you have enjoyed playing the limited version of Jagged Alliance 2 v1.13." );
}
else
{
swprintf( zString, L"You have %d game days left in this limited version of Jagged Alliance 2.", ( 8 - guiDay ) );
swprintf( zString, L"You have %d game days left in this limited version of Jagged Alliance 2 v1.13.", ( 8 - guiDay ) );
}
DoScreenIndependantMessageBox( zString, MSG_BOX_FLAG_OK, CrippledVersionEndGameCheckCallBack );
Utils/Utilities.cpp
+3 -3
View File
@@ -446,7 +446,7 @@ BOOLEAN HandleJA2CDCheck( )
sprintf( zErrorMessage, "%S", gzLateLocalizedString[ 56 ] );
// Pop up message boc and get answer....
if ( MessageBox( NULL, zErrorMessage, "Jagged Alliance 2", MB_OK ) == IDOK )
if ( MessageBox( NULL, zErrorMessage, "Jagged Alliance 2 v1.13", MB_OK ) == IDOK )
{
return( FALSE );
}
@@ -489,7 +489,7 @@ BOOLEAN HandleJA2CDCheckTwo( )
sprintf( zErrorMessage, "%S", gzLateLocalizedString[ 56 ] );
// Pop up message boc and get answer....
if ( MessageBox( NULL, zErrorMessage, "Jagged Alliance 2", MB_OK ) == IDOK )
if ( MessageBox( NULL, zErrorMessage, "Jagged Alliance 2 v1.13", MB_OK ) == IDOK )
{
return( FALSE );
}
@@ -519,7 +519,7 @@ BOOLEAN PerformTimeLimitedCheck()
if( sSystemTime.wYear > 1999 || sSystemTime.wMonth > 7 )
{
//spit out an error message
MessageBox( NULL, "This time limited version of Jagged Alliance 2 has expired.", "Ja2 Error!", MB_OK );
MessageBox( NULL, "This time limited version of Jagged Alliance 2 v1.13 has expired.", "Ja2 Error!", MB_OK );
return( FALSE );
}
Utils/_DutchText.cpp
+4 -3
View File
@@ -3756,6 +3756,7 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, game will be saved after each players turn.",
L"When ON, Skyrider will not talk anymore.",
L"When ON, game will run with much lower CPU usage.",
L"When ON, enhanced descriptions will be shown for items and weapons.",
};
@@ -3901,7 +3902,7 @@ STR16 pMessageStrings[] =
L"Dit slot is gereserveerd voor SnelBewaren tijdens tactische en kaartoverzichten m.b.v. ALT+S.",
L"Geopend",
L"Gesloten",
L"Schijfruimte raakt op. Er is slects %s MB vrij en Jagged Alliance 2 heeft %s MB nodig.",
L"Schijfruimte raakt op. Er is slects %s MB vrij en Jagged Alliance 2 v1.13 heeft %s MB nodig.",
L"%s ingehuurd van AIM",
L"%s heeft %s gevangen.", //'Merc name' has caught 'item' -- let SirTech know if name comes after item.
L"%s heeft de drug genomen.", //'Merc name' has taken the drug
@@ -4324,7 +4325,7 @@ STR16 gzLateLocalizedString[] =
//55
L"Kan tijd niet versneller tijdens bekijken van sector inventaris.",
L"Kan de Jagged Alliance 2 SPEL CD niet vinden. Programma wordt afgesloten.",
L"Kan de Jagged Alliance 2 v1.13 SPEL CD niet vinden. Programma wordt afgesloten.",
L"Items succesvol gecombineerd.",
@@ -4529,7 +4530,7 @@ STR16 MPClientMessage[] =
STR16 MPHelp[] =
{
// 0
L"Welcome to Jagged Alliance 2 Multiplayer",
L"Welcome to Jagged Alliance 2 v1.13 Multiplayer",
L"Press 'F1' for help",
L"Multiplayer controls (from strategy screen)",
L"* first set up ja2_mp.ini *",
Utils/_EnglishText.cpp
+4 -3
View File
@@ -3769,6 +3769,7 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, game will be saved after each players turn.",
L"When ON, Skyrider will not talk anymore.",
L"When ON, game will run with much lower CPU usage.",
L"When ON, enhanced descriptions will be shown for items and weapons.",
};
@@ -3914,7 +3915,7 @@ STR16 pMessageStrings[] =
L"This slot is reserved for Quick Saves made from the tactical and map screens using ALT+S.",
L"Opened",
L"Closed",
L"You are running low on disk space. You only have %sMB free and Jagged Alliance 2 requires %sMB.",
L"You are running low on disk space. You only have %sMB free and Jagged Alliance 2 v1.13 requires %sMB.",
L"Hired %s from AIM",
L"%s has caught %s.", //'Merc name' has caught 'item' -- let SirTech know if name comes after item.
L"%s has taken the drug.", //'Merc name' has taken the drug
@@ -4336,7 +4337,7 @@ STR16 gzLateLocalizedString[] =
//55
L"Can't compress time while viewing sector inventory.",
L"The Jagged Alliance 2 PLAY DISK was not found. Program will now exit.",
L"The Jagged Alliance 2 v1.13 PLAY DISK was not found. Program will now exit.",
L"Items successfully combined.",
@@ -4542,7 +4543,7 @@ STR16 MPClientMessage[] =
STR16 MPHelp[] =
{
// 0
L"Welcome to Jagged Alliance 2 Multiplayer",
L"Welcome to Jagged Alliance 2 v1.13 Multiplayer",
L"Press 'F1' for help",
L"Multiplayer controls (from strategy screen)",
L"* first set up ja2_mp.ini *",
Utils/_FrenchText.cpp
+4 -3
View File
@@ -3757,6 +3757,7 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, game will be saved after each players turn.",
L"When ON, Skyrider will not talk anymore.",
L"When ON, game will run with much lower CPU usage.",
L"When ON, enhanced descriptions will be shown for items and weapons.",
};
@@ -3903,7 +3904,7 @@ STR16 pMessageStrings[] =
L"Cet emplacement est réservé aux sauvegardes rapides effectuées depuis l'écran tactique (ALT+S).",
L"Ouverte",
L"Fermée",
L"Espace disque insuffisant. Il ne vous reste que %s Mo de libre et Jagged Alliance 2 nécessite %s Mo.",
L"Espace disque insuffisant. Il ne vous reste que %s Mo de libre et Jagged Alliance 2 v1.13 nécessite %s Mo.",
L"%s embauché(e) sur le site AIM",
L"%s prend %s.", //'Merc name' has caught 'item' -- let SirTech know if name comes after item.
L"%s a pris la drogue.", //'Merc name' has taken the drug
@@ -4325,7 +4326,7 @@ STR16 gzLateLocalizedString[] =
//55
L"Compression du temps impossible dans l'écran d'inventaire.",
L"Le CD Play de Jagged Alliance 2 est introuvable. L'application va se terminer.",
L"Le CD Play de Jagged Alliance 2 v1.13 est introuvable. L'application va se terminer.",
L"Objets associés.",
@@ -4530,7 +4531,7 @@ STR16 MPClientMessage[] =
STR16 MPHelp[] =
{
// 0
L"Welcome to Jagged Alliance 2 Multiplayer",
L"Welcome to Jagged Alliance 2 v1.13 Multiplayer",
L"Press 'F1' for help",
L"Multiplayer controls (from strategy screen)",
L"* first set up ja2_mp.ini *",
Utils/_GermanText.cpp
+4 -3
View File
@@ -3574,6 +3574,7 @@ STR16 zOptionsScreenHelpText[] =
L"Wenn diese Funktion aktiviert ist, wird nach jeder Runde automatisch gespeichert.",
L"Wenn diese Funktion aktiviert ist, wird Skyrider nichts mehr sprechen.",
L"Wenn diese Funktion aktiviert ist, wird das Spiel mit viel geringerer CPU Belastung laufen.",
L"Wenn diese Funktion aktiviert ist, werden erweiterte Beschreibungen zu den Waffen und Gegenständen angezeigt.",
};
STR16 gzGIOScreenText[] =
@@ -3716,7 +3717,7 @@ STR16 pMessageStrings[] =
L"Dieser Slot ist nur für Quick-Saves aus den Map Screens und dem Taktik-Bildschirm. Speichern mit ALT+S",
L"offen",
L"zu",
L"Ihr Festplattenspeicher ist knapp. Sie haben lediglich %sMB frei und Jagged Alliance 2 benötigt %sMB.",
L"Ihr Festplattenspeicher ist knapp. Sie haben lediglich %sMB frei und Jagged Alliance 2 v1.13 benötigt %sMB.",
L"%s von AIM angeheuert",
L"%s hat %s gefangen.", //'Merc name' has caught 'item' -- let SirTech know if name comes after item.
@@ -4129,7 +4130,7 @@ STR16 gzLateLocalizedString[] =
//55
L"Die Zeit kann nicht komprimiert werden während das Sektorinventar eingesehen wird.",
L"Die Jagged Alliance 2 PLAY CD wurde nicht gefunden. Das Programm wird jetzt beendet.",
L"Die Jagged Alliance 2 v1.13 PLAY CD wurde nicht gefunden. Das Programm wird jetzt beendet.",
//L"Im Sektor sind Feinde entdeckt worden", //STR_DETECTED_SIMULTANEOUS_ARRIVAL
@@ -4341,7 +4342,7 @@ STR16 MPClientMessage[] =
STR16 MPHelp[] =
{
// 0
L"Willkommen zu Jagged Alliance 2 Multiplayer",
L"Willkommen zu Jagged Alliance 2 v1.13 Multiplayer",
L"Drücken Sie 'F1' um die Hilfe aufzurufen",
L"Mehrspieler Aktionen (Strategische Ansicht)",
L"* zuerst solle die Datei ja2_mp.ini angepasst werden *",
Utils/_ItalianText.cpp
+4 -3
View File
@@ -3749,6 +3749,7 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, game will be saved after each players turn.",
L"When ON, Skyrider will not talk anymore.",
L"When ON, game will run with much lower CPU usage.",
L"When ON, enhanced descriptions will be shown for items and weapons.",
};
@@ -3894,7 +3895,7 @@ STR16 pMessageStrings[] =
L"Questo slot è riservato ai salvataggi rapidi fatti dalle schermate tattiche e dalla mappa utilizzando ALT+S.",
L"Aperto",
L"Chiuso",
L"Lo spazio su disco si sta esaurendo. Avete liberi solo %s MB e Jagged Alliance 2 ne richiede %s.",
L"Lo spazio su disco si sta esaurendo. Avete liberi solo %s MB e Jagged Alliance 2 v1.13 ne richiede %s.",
L"Arruolato %s dall'A.I.M.",
L"%s ha preso %s.", //'Merc name' has caught 'item' -- let SirTech know if name comes after item.
L"%s ha assunto della droga.", //'Merc name' has taken the drug
@@ -4322,7 +4323,7 @@ STR16 gzLateLocalizedString[] =
//55
L"Non potete comprimere il tempo mentre visualizzate l'inventario del settore.",
L"Il CD ddel gioco Jagged Alliance 2 non è stato trovato. Il programma verrà terminato.",
L"Il CD ddel gioco Jagged Alliance 2 v1.13 non è stato trovato. Il programma verrà terminato.",
L"Oggetti combinati con successo.",
@@ -4527,7 +4528,7 @@ STR16 MPClientMessage[] =
STR16 MPHelp[] =
{
// 0
L"Welcome to Jagged Alliance 2 Multiplayer",
L"Welcome to Jagged Alliance 2 v1.13 Multiplayer",
L"Press 'F1' for help",
L"Multiplayer controls (from strategy screen)",
L"* first set up ja2_mp.ini *",
Utils/_PolishText.cpp
+2 -2
View File
@@ -4330,7 +4330,7 @@ STR16 gzLateLocalizedString[] =
//55
L"Nie mo¿na kompresowaæ czasu, gdy otwarty jest inwentarz sektora.",
L"Nie odnaleziono p³yty nr 2 Jagged Alliance 2.",
L"Nie odnaleziono płyty nr 2 Jagged Alliance 2 v1.13.",
L"Przedmioty zosta³y pomyœlnie po³¹czone.",
@@ -4535,7 +4535,7 @@ STR16 MPClientMessage[] =
STR16 MPHelp[] =
{
// 0
L"Welcome to JAGGED ALLIANCE 2 v1.13 Multiplayer",
L"Welcome to Jagged Alliance2 2 v1.13 Multiplayer",
L"Press 'F1' for help",
L"Multiplayer controls (from strategy screen)",
L"* first set up ja2_mp.ini *",
Utils/_RussianText.cpp
+2 -2
View File
@@ -3910,7 +3910,7 @@ STR16 pMessageStrings[] =
L"Эта ячейка зарезервирована для Быстрого Сохранения, которое можно провести с тактической карты или с глобальной карты, нажав клавиши ALT+S.",
L"Открытая",
L"Закрытая",
L"У вас заканчивается свободное дисковое пространство. На диске есть всего %sMб свободного места, а для Jagged Alliance 2 требуется %sMб.",
L"У вас заканчивается свободное дисковое пространство. На диске есть всего %sMб свободного места, а для Jagged Alliance 2 v1.13 требуется %sMб.",
L"Из A.I.M. нанят боец %s.",
L"%s ловит %s.", //'Merc name' has caught 'item' -- let SirTech know if name comes after item.
L"%s принимает препарат.", //'Merc name' has taken the drug
@@ -4539,7 +4539,7 @@ STR16 MPClientMessage[] =
STR16 MPHelp[] =
{
// 0
L"Запущена сетевая игра Jagged Alliance 2",
L"Запущена сетевая игра Jagged Alliance 2 v1.13",
L"Нажмите F1 для просмотра помощи.",
L"Управление сетевой игрой (на стратегическом экране)",
L"* Сперва установите настройки в файле ja2_mp.ini *",
Utils/_TaiwaneseText.cpp
+4 -3
View File
@@ -3768,6 +3768,7 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, game will be saved after each players turn.",
L"When ON, Skyrider will not talk anymore.",
L"When ON, game will run with much lower CPU usage.",
L"When ON, enhanced descriptions will be shown for items and weapons.",
};
@@ -3914,7 +3915,7 @@ STR16 pMessageStrings[] =
L"This slot is reserved for Quick Saves made from the tactical and map screens using ALT+S.",
L"Opened",
L"Closed",
L"You are running low on disk space. You only have %sMB free and Jagged Alliance 2 requires %sMB.",
L"You are running low on disk space. You only have %sMB free and Jagged Alliance 2 v1.13 requires %sMB.",
L"Hired %s from AIM",
L"%s has caught %s.", //'Merc name' has caught 'item' -- let SirTech know if name comes after item.
L"%s has taken the drug.", //'Merc name' has taken the drug
@@ -4336,7 +4337,7 @@ STR16 gzLateLocalizedString[] =
//55
L"Can't compress time while viewing sector inventory.",
L"The Jagged Alliance 2 PLAY DISK was not found. Program will now exit.",
L"The Jagged Alliance 2 v1.13 PLAY DISK was not found. Program will now exit.",
L"Items successfully combined.",
@@ -4541,7 +4542,7 @@ STR16 MPClientMessage[] =
STR16 MPHelp[] =
{
// 0
L"Welcome to Jagged Alliance 2 Multiplayer",
L"Welcome to Jagged Alliance 2 v1.13 Multiplayer",
L"Press 'F1' for help",
L"Multiplayer controls (from strategy screen)",
L"* first set up ja2_mp.ini *",
ja2_2005Express.vcproj
+1 -1
View File
@@ -145,7 +145,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStatic.lib ws2_32.lib"
OutputFile="$(OutDir)\ja2_release_2389_en.exe"
OutputFile="$(OutDir)\ja2_release_2415_en.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
GenerateMapFile="true"
local.h
+1 -1
View File
@@ -11,7 +11,7 @@
// Make sure the application has a name
//
#define APPLICATION_NAME "Jagged Alliance 2"
#define APPLICATION_NAME "Jagged Alliance 2 v1.13"
//
// Basic defines for the video manager. These represent the starting values