mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
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
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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 *",
|
||||
|
||||
@@ -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 *",
|
||||
|
||||
@@ -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 *",
|
||||
|
||||
@@ -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 *",
|
||||
|
||||
@@ -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 *",
|
||||
|
||||
@@ -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 *",
|
||||
|
||||
@@ -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 *",
|
||||
|
||||
@@ -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 *",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="8.00"
|
||||
Version="8,00"
|
||||
Name="ja2_2005Express"
|
||||
ProjectGUID="{F44669E7-74AC-444B-B75F-F16F4B9F0265}"
|
||||
RootNamespace="ja2_2005Express"
|
||||
|
||||
Reference in New Issue
Block a user