- second code patch from Brent Johnson (Nonomori), aimed at source compatibility with VS.NET 2005

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

JA2 Splash.cpp

@@ -11,13 +11,16 @@ extern HVSURFACE ghFrameBuffer;
 //Simply create videosurface, load image, and draw it to the screen.
 void InitJA2SplashScreen()
 {
+#ifdef ENGLISH
+	ClearMainMenu();
+
+#else
 	UINT32 uiLogoID = 0;
 	HVSURFACE hVSurface; // unused jonathanl  // lalien reenabled for international versions
 	VSURFACE_DESC VSurfaceDesc; //unused jonathanl // lalien reenabled for international versions
+ #ifdef JA2TESTVERSION
 	INT32 i = 0;
 
-#if !defined( ENGLISH ) && defined( JA2TESTVERSION )
-
 	memset( &VSurfaceDesc, 0, sizeof( VSURFACE_DESC ) );
 	VSurfaceDesc.fCreateFlags = VSURFACE_CREATE_FROMFILE | VSURFACE_SYSTEM_MEM_USAGE;
 	sprintf( VSurfaceDesc.ImageFile, "LOADSCREENS\\Notification.sti" );
@@ -44,11 +47,6 @@ void InitJA2SplashScreen()
 	}
 #endif
 	
-	#ifdef ENGLISH
-		ClearMainMenu();
-	#else
-		{
-
 			memset( &VSurfaceDesc, 0, sizeof( VSURFACE_DESC ) );
 			VSurfaceDesc.fCreateFlags = VSURFACE_CREATE_FROMFILE | VSURFACE_SYSTEM_MEM_USAGE;
 			GetMLGFilename( VSurfaceDesc.ImageFile, MLG_SPLASH );
@@ -61,10 +59,8 @@ void InitJA2SplashScreen()
 			GetVideoSurface( &hVSurface, uiLogoID );
 			BltVideoSurfaceToVideoSurface( ghFrameBuffer, hVSurface, 0, iScreenWidthOffset, iScreenHeightOffset, 0, NULL );
 			DeleteVideoSurfaceFromIndex( uiLogoID );
-		}
 	#endif
 
-
 	InvalidateScreen();
 	RefreshScreen( NULL );