From 089e08f202e6371ba3f5d51202ebc58caa8af1a9 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sun, 15 Jul 2007 11:12:27 +0000
Subject: [PATCH] Small fixes for compiling different language versions
 (German, Russian)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1053 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 GameVersion.cpp                        | 4 ++--
 JA2 Splash.cpp                         | 1 +
 Standard Gaming Platform/video.cpp     | 2 +-
 Utils/Multi Language Graphic Utils.cpp | 2 +-
 Utils/_Ja25GermanText.cpp              | 6 ++----
 Utils/_Ja25RussianText.cpp             | 6 ++----
 Utils/_RussianText.cpp                 | 2 ++
 7 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/GameVersion.cpp b/GameVersion.cpp
index d13fb5b6..a183eff8 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -23,12 +23,12 @@ CHAR16 zVersionLabel[256]		= { L"Beta v. 0.98" };
 #else
 
 	//RELEASE BUILD VERSION  
-	CHAR16		zVersionLabel[256]		= { L"Release v1.13.1051" };
+	CHAR16		zVersionLabel[256]		= { L"Release v1.13.1052" };
 
 
 #endif
 										
-CHAR8		czVersionNumber[16]	= { "Build 07.06.10" };		//YY.MM.DD
+CHAR8		czVersionNumber[16]	= { "Build 07.07.15" };		//YY.MM.DD
 CHAR16		zTrackingNumber[16]	= { L"Z" };
 	
 
diff --git a/JA2 Splash.cpp b/JA2 Splash.cpp
index 64afa20d..4c267180 100644
--- a/JA2 Splash.cpp	
+++ b/JA2 Splash.cpp	
@@ -6,6 +6,7 @@
 #include "mainmenuscreen.h"
 #include "Video.h"
 #include "Timer Control.h"
+#include "Multi Language Graphic Utils.h"
 #endif
 
 UINT32 guiSplashFrameFade = 10;
diff --git a/Standard Gaming Platform/video.cpp b/Standard Gaming Platform/video.cpp
index cf5c10b6..3bad6393 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, "Windowed JA2 !!", style, window.left, window.top, window.right, window.bottom, NULL, NULL, hInstance, NULL);
+	hWindow = CreateWindowEx(exstyle, (LPCSTR) ClassName, "Jagged Alliance 2 v1.13", style, window.left, window.top, window.right, window.bottom, NULL, NULL, hInstance, NULL);
 	GetClientRect( hWindow, &window);
 	window.top = window.top;
   }
diff --git a/Utils/Multi Language Graphic Utils.cpp b/Utils/Multi Language Graphic Utils.cpp
index 09d58e1e..90809cab 100644
--- a/Utils/Multi Language Graphic Utils.cpp	
+++ b/Utils/Multi Language Graphic Utils.cpp	
@@ -253,7 +253,7 @@ BOOLEAN GetMLGFilename( SGPFILENAME filename, UINT16 usMLGGraphicID )
 		#elif defined( POLISH )
 		  sprintf( zLanguage, "POLISH" );
 		#elif defined( RUSSIAN )
-		  sprintf( zLanguage, "RUSSIAN" );
+		  sprintf( (char *)zLanguage, "RUSSIAN" );
 		#elif defined( SPANISH )
 		  sprintf( zLanguage, "SPANISH" );
 		#elif defined( TAIWANESE )
diff --git a/Utils/_Ja25GermanText.cpp b/Utils/_Ja25GermanText.cpp
index fde182c3..1ba8a4b6 100644
--- a/Utils/_Ja25GermanText.cpp
+++ b/Utils/_Ja25GermanText.cpp
@@ -3,10 +3,8 @@
 	#include "_Ja25EnglishText.h"
 #else
 	#include "Language Defines.h"
-	#ifdef ENGLISH
-		#include "text.h"
-		#include "Fileman.h"
-	#endif
+	#include "text.h"
+	#include "Fileman.h"
 #endif
 
 #ifdef GERMAN
diff --git a/Utils/_Ja25RussianText.cpp b/Utils/_Ja25RussianText.cpp
index 28e60d5a..936e9b4e 100644
--- a/Utils/_Ja25RussianText.cpp
+++ b/Utils/_Ja25RussianText.cpp
@@ -3,10 +3,8 @@
 	#include "_Ja25RussianText.h"
 #else
 	#include "Language Defines.h"
-	#ifdef ENGLISH
-		#include "text.h"
-		#include "Fileman.h"
-	#endif
+	#include "text.h"
+	#include "Fileman.h"
 #endif
 
 #ifdef RUSSIAN
diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp
index 6ecc3a6c..1fe440bd 100644
--- a/Utils/_RussianText.cpp
+++ b/Utils/_RussianText.cpp
@@ -3,6 +3,8 @@
 #else
 #endif
 #include "Language Defines.h"
+#include "text.h"
+#include "Fileman.h"
 
 #ifdef RUSSIAN