- removed loading of unused ja2_logo.STI

- message "windowed mode requires a color depth of 16bpp" localized (need translation to Dutch & German)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3163 3b4a5df2-a311-0410-b5c6-a8a6f20db521

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;
 	}

Utils/Text.h

@@ -1745,6 +1745,14 @@ enum
 
 // OJW - MP
 extern STR16 gszMPMapscreenText[];
+
+//SB
+enum
+{
+	ADDTEXT_16BPP_REQUIRED,
+};
+extern STR16 Additional113Text[];
+
 #endif
 
 

Utils/_ChineseText.cpp

@@ -4862,4 +4862,9 @@ STR16 gzIMPDisabilityTraitText[]=
 	L"I.M.P. 性格缺陷",
 };
 
+STR16 Additional113Text[]=
+{
+	L"Jagged Alliance 2 v1.13 窗口模式需要一个16bpp或更少的颜色深度。",
+};
+
 #endif //CHINESE

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

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

Utils/_FrenchText.cpp

@@ -4853,4 +4853,9 @@ STR16 gzIMPDisabilityTraitText[]=
 	L"I.M.P. Disabilities",
 };
 
+STR16 Additional113Text[]=
+{
+	L"Jagged Alliance 2 v1.13 mode fenêtré exige une profondeur de couleur de 16 bit ou moins.",
+};
+
 #endif //FRENCH

Utils/_GermanText.cpp

@@ -4647,4 +4647,9 @@ STR16 gzIMPDisabilityTraitText[]=
 	L"Ihre größte Schwäche",
 };
 
+STR16 Additional113Text[]=
+{
+	L"Jagged Alliance 2 v1.13 windowed mode requires a color depth of 16bpp or less.",
+};
+
 #endif //GERMAN

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

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 głębi koloru 16-bitowego lub mniej.",
+};
+
 #endif //POLISH

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

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

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 );

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