From d63ae7501bc8f7fccb8cecd90f2909fabdefe7d9 Mon Sep 17 00:00:00 2001 From: Wanne Date: Tue, 4 Nov 2008 19:44:03 +0000 Subject: [PATCH] Bugfix: JA2 now shuts down without an error, if the desktop colors are not set to 16 bit color after the message box appears Changed some text strings from "Jagged Alliance 2 v1.13" to "Jagged Alliance 2", so the game consistently used "Jagged Alliance 2". git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2396 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Standard Gaming Platform/video.cpp | 5 +++-- Utils/_DutchText.cpp | 2 +- Utils/_EnglishText.cpp | 2 +- Utils/_FrenchText.cpp | 2 +- Utils/_GermanText.cpp | 2 +- Utils/_ItalianText.cpp | 2 +- Utils/_PolishText.cpp | 2 +- Utils/_RussianText.cpp | 2 +- Utils/_TaiwaneseText.cpp | 2 +- ja2_2005Express.vcproj | 2 +- 10 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Standard Gaming Platform/video.cpp b/Standard Gaming Platform/video.cpp index 52e2296c..23324156 100644 --- a/Standard Gaming Platform/video.cpp +++ b/Standard Gaming Platform/video.cpp @@ -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 v1.13", style, window.left, window.top, window.right, window.bottom, NULL, NULL, hInstance, NULL); + hWindow = CreateWindowEx(exstyle, (LPCSTR) ClassName, "Jagged Alliance 2", style, window.left, window.top, window.right, window.bottom, NULL, NULL, hInstance, NULL); GetClientRect( hWindow, &window); window.top = window.top; } @@ -639,7 +639,8 @@ BOOLEAN InitializeVideoManager(HINSTANCE hInstance, UINT16 usCommandShow, void * // This function must be called to setup RGB information // - GetRGBDistribution(); + if (GetRGBDistribution() == FALSE) + return FALSE; return TRUE; diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index dd9c1e90..7743ad6e 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -4345,7 +4345,7 @@ STR16 MPClientMessage[] = STR16 MPHelp[] = { // 0 - L"Welcome to JAGGED ALLIANCE 2 v1.13 Multiplayer", + L"Welcome to Jagged Alliance 2 Multiplayer", L"Press 'F1' for help", L"Multiplayer controls (from strategy screen)", L"* first set up ja2_mp.ini *", diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 1abfc93a..5450c4c9 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -4360,7 +4360,7 @@ STR16 MPClientMessage[] = STR16 MPHelp[] = { // 0 - L"Welcome to Jagged Alliance 2 1.13 Multiplayer", + L"Welcome to Jagged Alliance 2 Multiplayer", L"Press 'F1' for help", L"Multiplayer controls (from strategy screen)", L"* first set up ja2_mp.ini *", diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index e2ec19ae..58087cc4 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -4346,7 +4346,7 @@ STR16 MPClientMessage[] = STR16 MPHelp[] = { // 0 - L"Welcome to JAGGED ALLIANCE 2 v1.13 Multiplayer", + L"Welcome to Jagged Alliance 2 Multiplayer", L"Press 'F1' for help", L"Multiplayer controls (from strategy screen)", L"* first set up ja2_mp.ini *", diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index 1499ef99..748df717 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -4157,7 +4157,7 @@ STR16 MPClientMessage[] = STR16 MPHelp[] = { // 0 - L"Willkommen zu Jagged Alliance 2 1.13 Multiplayer", + L"Willkommen zu Jagged Alliance 2 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 *", diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index fbe79214..7f856ed9 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -4343,7 +4343,7 @@ STR16 MPClientMessage[] = STR16 MPHelp[] = { // 0 - L"Welcome to JAGGED ALLIANCE 2 v1.13 Multiplayer", + L"Welcome to Jagged Alliance 2 Multiplayer", L"Press 'F1' for help", L"Multiplayer controls (from strategy screen)", L"* first set up ja2_mp.ini *", diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index 19e98dcd..146f025c 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -4339,7 +4339,7 @@ STR16 MPClientMessage[] = STR16 MPHelp[] = { // 0 - L"Welcome to JAGGED ALLIANCE 2 v1.13 Multiplayer", + L"Welcome to Jagged Alliance 2 Multiplayer", L"Press 'F1' for help", L"Multiplayer controls (from strategy screen)", L"* first set up ja2_mp.ini *", diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 3561a5de..1601b12a 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -4354,7 +4354,7 @@ STR16 MPClientMessage[] = STR16 MPHelp[] = { // 0 - L"Запущена сетевая игра Jagged Alliance 2 1.13", + L"Запущена сетевая игра Jagged Alliance 2", L"Нажмите F1 для просмотра помощи.", L"Управление сетевой игрой (на стратегическом экране)", L"* Сперва установите настройки в файле ja2_mp.ini *", diff --git a/Utils/_TaiwaneseText.cpp b/Utils/_TaiwaneseText.cpp index 01cbe89e..deef0260 100644 --- a/Utils/_TaiwaneseText.cpp +++ b/Utils/_TaiwaneseText.cpp @@ -4359,7 +4359,7 @@ STR16 MPClientMessage[] = STR16 MPHelp[] = { // 0 - L"Welcome to JAGGED ALLIANCE 2 v1.13 Multiplayer", + L"Welcome to Jagged Alliance 2 Multiplayer", L"Press 'F1' for help", L"Multiplayer controls (from strategy screen)", L"* first set up ja2_mp.ini *", diff --git a/ja2_2005Express.vcproj b/ja2_2005Express.vcproj index faab2bc7..b75c9be2 100644 --- a/ja2_2005Express.vcproj +++ b/ja2_2005Express.vcproj @@ -1,7 +1,7 @@