diff --git a/Standard Gaming Platform/video.cpp b/Standard Gaming Platform/video.cpp index 0b2c6393..31ef4331 100644 --- a/Standard Gaming Platform/video.cpp +++ b/Standard Gaming Platform/video.cpp @@ -24,6 +24,10 @@ #include "VFS/vfs.h" #include "VFS/vfs_file_raii.h" +#include "Local.h" +#include "text.h" + + #ifndef _MT #define _MT #endif @@ -2845,7 +2849,7 @@ BOOLEAN GetRGBDistribution(void) if (!gusRedMask) { - MessageBox( NULL, "Jagged Alliance 2 v1.13 windowed mode requires a color depth of 16bpp or less.", "Jagged Alliance 2 v1.13", MB_ICONEXCLAMATION); + MessageBoxW( NULL, Additional113Text[ADDTEXT_16BPP_REQUIRED], APPLICATION_NAMEW, MB_ICONEXCLAMATION); PostQuitMessage(1); return FALSE; } diff --git a/Utils/Text.h b/Utils/Text.h index a0c5d3f6..75e61b54 100644 --- a/Utils/Text.h +++ b/Utils/Text.h @@ -1745,6 +1745,14 @@ enum // OJW - MP extern STR16 gszMPMapscreenText[]; + +//SB +enum +{ + ADDTEXT_16BPP_REQUIRED, +}; +extern STR16 Additional113Text[]; + #endif diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index 0d2385de..fb131203 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -4862,4 +4862,9 @@ STR16 gzIMPDisabilityTraitText[]= L"I.M.P. 性格缺陷", }; +STR16 Additional113Text[]= +{ + L"Jagged Alliance 2 v1.13 窗口模式需要一个16bpp或更少的颜色深度。", +}; + #endif //CHINESE diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index a43f15ff..a0642dee 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -4839,4 +4839,9 @@ STR16 gzIMPDisabilityTraitText[]= L"I.M.P. Disabilities", }; +STR16 Additional113Text[]= +{ + L"Jagged Alliance 2 v1.13 windowed mode requires a color depth of 16bpp or less.", +}; + #endif //DUTCH diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 74b0ee77..9d6270ec 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -4853,4 +4853,9 @@ STR16 gzIMPDisabilityTraitText[]= L"I.M.P. Disabilities", }; +STR16 Additional113Text[]= +{ + L"Jagged Alliance 2 v1.13 windowed mode requires a color depth of 16bpp or less.", +}; + #endif //ENGLISH diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index a1bf5724..d7b79b99 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -4853,4 +4853,9 @@ STR16 gzIMPDisabilityTraitText[]= L"I.M.P. Disabilities", }; +STR16 Additional113Text[]= +{ + L"Jagged Alliance 2 v1.13 mode fentr exige une profondeur de couleur de 16 bit ou moins.", +}; + #endif //FRENCH diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index d0877a22..454335f2 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -4647,4 +4647,9 @@ STR16 gzIMPDisabilityTraitText[]= L"Ihre grte Schwche", }; +STR16 Additional113Text[]= +{ + L"Jagged Alliance 2 v1.13 windowed mode requires a color depth of 16bpp or less.", +}; + #endif //GERMAN diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 58153d74..954d2813 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -4837,4 +4837,9 @@ STR16 gzIMPDisabilityTraitText[]= L"I.M.P. Disabilities", }; +STR16 Additional113Text[]= +{ + L"Jagged Alliance 2 v1.13 modalit finestra richiede una profondit di colore di 16bpp o meno.", +}; + #endif //ITALIAN diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index 6e2a8811..651c5505 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -4842,4 +4842,9 @@ STR16 gzIMPDisabilityTraitText[]= L"I.M.P. Disabilities", }; +STR16 Additional113Text[]= +{ + L"Jagged Alliance 2 v1.13 trybie okienkowym wymaga gbi koloru 16-bitowego lub mniej.", +}; + #endif //POLISH diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index bb13ce6d..832254d2 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -966,9 +966,9 @@ STR16 gpStrategicString[] = //These are the labels for the different types of enemies we fight in autoresolve. L"", //STR_AR_MILITIA_NAME, - L"", //STR_AR_ELITE_NAME, + L"", //STR_AR_ELITE_NAME, L"", //STR_AR_TROOP_NAME, - L"", //STR_AR_ADMINISTRATOR_NAME, + L"", //STR_AR_ADMINISTRATOR_NAME, L"", //STR_AR_CREATURE_NAME, //Label for the length of time the battle took @@ -4847,4 +4847,9 @@ STR16 gzIMPDisabilityTraitText[]= L"I.M.P. ", //I.M.P. Disabilities }; +STR16 Additional113Text[]= +{ + L" Jagged Alliance 2 v1.13 16- ",//Jagged Alliance 2 v1.13 windowed mode requires a color depth of 16bpp or less. +}; + #endif //RUSSIAN diff --git a/Utils/_TaiwaneseText.cpp b/Utils/_TaiwaneseText.cpp index 98ac24d0..343c9f6c 100644 --- a/Utils/_TaiwaneseText.cpp +++ b/Utils/_TaiwaneseText.cpp @@ -4850,4 +4850,9 @@ STR16 gzIMPDisabilityTraitText[]= L"I.M.P. Disabilities", }; +STR16 Additional113Text[]= +{ + L"Jagged Alliance 2 v1.13 windowed mode requires a color depth of 16bpp or less.", +}; + #endif //TAIWANESE diff --git a/jascreens.cpp b/jascreens.cpp index a3b0de0f..f1c86eb8 100644 --- a/jascreens.cpp +++ b/jascreens.cpp @@ -356,8 +356,6 @@ UINT32 InitScreenInitialize(void) UINT32 InitScreenHandle(void) { - VSURFACE_DESC vs_desc; - static HVSURFACE hVSurface; static UINT8 ubCurrentScreen = 255; if ( ubCurrentScreen == 255 ) @@ -387,18 +385,6 @@ UINT32 InitScreenHandle(void) // Load version number.... //HandleLimitedNumExecutions( ); - // Load init screen and blit! - vs_desc.fCreateFlags = VSURFACE_CREATE_FROMFILE | VSURFACE_SYSTEM_MEM_USAGE; - - strcpy( vs_desc.ImageFile, "ja2_logo.STI" ); - - hVSurface = CreateVideoSurface( &vs_desc ); -//SB: JA2 Gold Rus doesn't contain such file! -#ifndef RUSSIAN - if( !hVSurface ) - AssertMsg( 0, "Failed to load ja2_logo.sti!" ); -#endif - //BltVideoSurfaceToVideoSurface( ghFrameBuffer, hVSurface, 0, 0, 0, VS_BLT_FAST, NULL ); ubCurrentScreen = 1; // Init screen @@ -485,14 +471,6 @@ UINT32 InitScreenHandle(void) InvalidateScreen( ); - // Delete video Surface -//SB: JA2 Gold Rus doesn't contain such file! -#ifdef RUSSIAN - if( hVSurface ) -#endif - DeleteVideoSurface( hVSurface ); - //ATE: Set to true to reset before going into main screen! - SetCurrentCursorFromDatabase( VIDEO_NO_CURSOR ); return( INIT_SCREEN ); diff --git a/local.h b/local.h index 995ce7b6..fbaaad9e 100644 --- a/local.h +++ b/local.h @@ -12,6 +12,7 @@ // #define APPLICATION_NAME "Jagged Alliance 2 v1.13" +#define APPLICATION_NAMEW L"Jagged Alliance 2 v1.13" // // Basic defines for the video manager. These represent the starting values