1dot13 · majcosta · Dec 27, 2024 · Dec 25, 2024 · Dec 25, 2024
diff --git a/Ja2/CMakeLists.txt b/Ja2/CMakeLists.txt
@@ -14,7 +14,6 @@ set(Ja2Src
 "${CMAKE_CURRENT_SOURCE_DIR}/JA2 Splash.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/Ja25Update.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/jascreens.cpp"
-"${CMAKE_CURRENT_SOURCE_DIR}/Language Defines.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/Loading Screen.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/MainMenuScreen.cpp"
 "${CMAKE_CURRENT_SOURCE_DIR}/MessageBoxScreen.cpp"

diff --git a/Ja2/Cheats.h b/Ja2/Cheats.h
@@ -1,7 +1,6 @@
 #ifndef _CHEATS__H_
 #define _CHEATS__H_
 
-#include "Language Defines.h"
 
 extern UINT8 gubCheatLevel;
 

diff --git a/Ja2/Credits.cpp b/Ja2/Credits.cpp
@@ -1,6 +1,5 @@
 	#include "Types.h"
 	#include "Credits.h"
-	#include "Language Defines.h"
 	#include "vsurface.h"
 	#include "mousesystem.h"
 	#include "Text.h"

diff --git a/Ja2/FeaturesScreen.cpp b/Ja2/FeaturesScreen.cpp
@@ -26,7 +26,6 @@
 #include	"Text.h"
 #include	"Interface Control.h"
 #include	"Message.h"
-#include	"Language Defines.h"
 #include	"Multi Language Graphic Utils.h"
 #include	"Map Information.h"
 #include	"Sys Globals.h"

diff --git a/Ja2/GameSettings.cpp b/Ja2/GameSettings.cpp
@@ -10,7 +10,6 @@
 	#include	"GameVersion.h"
 	#include	"LibraryDataBase.h"
 	#include	"Debug.h"
-	#include	"Language Defines.h"
 	#include "HelpScreen.h"
 	#include "INIReader.h"
 	#include "Shade Table Util.h"

diff --git a/Ja2/Language Defines.cpp b/Ja2/Language Defines.cpp
diff --git a/Ja2/Language Defines.h b/Ja2/Language Defines.h
diff --git a/Ja2/Options Screen.cpp b/Ja2/Options Screen.cpp
@@ -29,7 +29,6 @@
 	#include	"Text.h"
 	#include	"Interface Control.h"
 	#include	"Message.h"
-	#include	"Language Defines.h"
 	#include "Multi Language Graphic Utils.h"
 	#include "Map Information.h"
 	#include "SmokeEffects.h"

diff --git a/Ja2/builddefines.h b/Ja2/builddefines.h
@@ -1,8 +1,6 @@
 #ifndef _BUILDDEFINES_H
 #define _BUILDDEFINES_H
 
-#include "Language Defines.h"
-
 //----- Briefing Room (Mission based JA2 like in JA/DG) - by Jazz -----
 // Once enabled here and also enabled in the ja2_options.ini (BRIEFING_ROOM), 
 // you can access the briefing room feature from the laptop

diff --git a/Ja2/jascreens.cpp b/Ja2/jascreens.cpp
@@ -45,7 +45,6 @@
 	#include "Sound Control.h"
 	#include "WordWrap.h"
 	#include "text.h"
-	#include "Language Defines.h"
 	#include "IniReader.h"
 
 #include "sgp_logger.h"

diff --git a/Laptop/AimMembers.cpp b/Laptop/AimMembers.cpp
@@ -36,7 +36,6 @@
 	#include "Strategic Status.h"
 	#include "Merc Contract.h"
 	#include "Strategic Merc Handler.h"
-	#include "Language Defines.h"
 	#include "Assignments.h"
 	#include "Sound Control.h"
 	#include "Quests.h"

diff --git a/Tactical/Interface Enhanced.cpp b/Tactical/Interface Enhanced.cpp
@@ -44,7 +44,6 @@
 	#include "soldier macros.h"
 	#include "squads.h"
 	#include "MessageBoxScreen.h"
-	#include "Language Defines.h"
 	#include "GameSettings.h"
 	#include "Map Screen Interface Map Inventory.h"
 	#include "Quests.h"

diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp
@@ -57,7 +57,6 @@
 	#include "game clock.h"
 	#include "squads.h"
 	#include "MessageBoxScreen.h"
-	#include "Language Defines.h"
 	#include "GameSettings.h"
 	#include "Map Screen Interface Map Inventory.h"
 	#include "Quests.h"

diff --git a/Utils/Encrypted File.cpp b/Utils/Encrypted File.cpp
@@ -2,7 +2,6 @@
 	#include "FileMan.h"
 	#include "Debug.h"
 
-#include "Language Defines.h"
 // anv: for selecting random line
 #include "Random.h"
 

diff --git a/Utils/ImportStrings.cpp b/Utils/ImportStrings.cpp
@@ -1,6 +1,5 @@
 #include "ImportStrings.h"
 #include "LocalizedStrings.h"
-#include "Language Defines.h"
 
 #include <vfs/Tools/vfs_tools.h>
 #include <vfs/Core/vfs.h>

diff --git a/Utils/Multi Language Graphic Utils.cpp b/Utils/Multi Language Graphic Utils.cpp
@@ -4,7 +4,6 @@
 #include "Types.h"
 #include "Multi Language Graphic Utils.h"
 
-#include "Language Defines.h"
 //SB
 #include "FileMan.h"
 

diff --git a/Utils/Multilingual Text Code Generator.cpp b/Utils/Multilingual Text Code Generator.cpp
@@ -32,7 +32,6 @@ CREATED:	Feb 16, 1999
 #include "builddefines.h"
 #include <stdio.h>
 #include "types.h"
-#include "Language Defines.h"
 #include "debug.h"
 #include "Fileman.h"
 

diff --git a/Utils/Utils All.h b/Utils/Utils All.h
@@ -41,7 +41,6 @@
 #include "opplist.h"
 #include "himage.h"
 #include "vsurface_private.h"
-#include "Language Defines.h"
 #include "text.h"
 #include "Screens.h"
 #include "Maputility.h"

diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp
@@ -1,7 +1,6 @@
 // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build!
 //#pragma setlocale("CHINESE")
 
-	#include "Language Defines.h"
 	#if defined( CHINESE )
 		#include "text.h"
 		#include "Fileman.h"

diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp
@@ -1,7 +1,6 @@
 // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build!
 //#pragma setlocale("DUTCH")
 
-	#include "Language Defines.h"
 	#if defined( DUTCH )
 		#include "text.h"
 		#include "Fileman.h"

diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp
@@ -1,7 +1,6 @@
 // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build!
 //#pragma setlocale("ENGLISH")
 
-	#include "Language Defines.h"
 	#if defined( ENGLISH )
 		#include "text.h"
 		#include "Fileman.h"

diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp
@@ -1,7 +1,6 @@
 // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build!
 //#pragma setlocale("FRENCH")
 
-	#include "Language Defines.h"
 	#ifdef FRENCH
 		#include "text.h"
 		#include "Fileman.h"

diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp
@@ -1,7 +1,6 @@
 // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build!
 //#pragma setlocale("GERMAN")
 
-	#include "Language Defines.h"
 	#ifdef GERMAN
 		#include "text.h"
 		#include "Fileman.h"

diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp
@@ -1,7 +1,6 @@
 // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build!
 //#pragma setlocale("ITALIAN")
 
-	#include "Language Defines.h"
 	#if defined( ITALIAN )
 		#include "text.h"
 		#include "Fileman.h"

diff --git a/Utils/_Ja25ChineseText.cpp b/Utils/_Ja25ChineseText.cpp
@@ -1,7 +1,6 @@
 // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build!
 //#pragma setlocale("CHINESE")
 
-	#include "Language Defines.h"
 	#ifdef CHINESE
 		#include "text.h"
 		#include "Fileman.h"

diff --git a/Utils/_Ja25DutchText.cpp b/Utils/_Ja25DutchText.cpp
@@ -1,7 +1,6 @@
 // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build!
 //#pragma setlocale("DUTCH")
 
-	#include "Language Defines.h"
 	#ifdef DUTCH
 		#include "text.h"
 		#include "Fileman.h"

diff --git a/Utils/_Ja25EnglishText.cpp b/Utils/_Ja25EnglishText.cpp
@@ -1,7 +1,6 @@
 // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build!
 //#pragma setlocale("ENGLISH")
 
-	#include "Language Defines.h"
 	#ifdef ENGLISH
 		#include "text.h"
 		#include "Fileman.h"

diff --git a/Utils/_Ja25FrenchText.cpp b/Utils/_Ja25FrenchText.cpp
@@ -1,7 +1,6 @@
 // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build!
 //#pragma setlocale("FRENCH")
 
-	#include "Language Defines.h"
 	#ifdef FRENCH
 		#include "text.h"
 		#include "Fileman.h"

diff --git a/Utils/_Ja25GermanText.cpp b/Utils/_Ja25GermanText.cpp
@@ -1,7 +1,6 @@
 // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build!
 //#pragma setlocale("GERMAN")
 
-	#include "Language Defines.h"
 	#ifdef GERMAN
 		#include "text.h"
 		#include "Fileman.h"

diff --git a/Utils/_Ja25ItalianText.cpp b/Utils/_Ja25ItalianText.cpp
@@ -1,7 +1,6 @@
 // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build!
 //#pragma setlocale("ITALIAN")
 
-	#include "Language Defines.h"
 	#ifdef ITALIAN
 		#include "text.h"
 		#include "Fileman.h"

diff --git a/Utils/_Ja25PolishText.cpp b/Utils/_Ja25PolishText.cpp
@@ -2,7 +2,6 @@
 // WANNE: Yes we need this here exclusivly in Polish version, because we do not have a codepage in the code like for other versions.
 //#pragma setlocale("POLISH")
 
-	#include "Language Defines.h"
 	#ifdef POLISH
 		#include "text.h"
 		#include "Fileman.h"

diff --git a/Utils/_Ja25RussianText.cpp b/Utils/_Ja25RussianText.cpp
@@ -1,7 +1,6 @@
 // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build!
 //#pragma setlocale("RUSSIAN")
 
-	#include "Language Defines.h"
 	#ifdef RUSSIAN
 		#include "text.h"
 		#include "Fileman.h"

diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp
@@ -2,7 +2,6 @@
 // WANNE: Yes we need this here exclusivly in Polish version, because we do not have a codepage in the code like for other versions.
 //#pragma setlocale("POLISH")
 
-	#include "Language Defines.h"
 	#if defined( POLISH )
 		#include "text.h"
 		#include "Fileman.h"

diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp
@@ -1,7 +1,6 @@
 // WANNE: Yes, this should be disabled, otherwise we get weird behavior when running the game with a VS 2005 build!
 //#pragma setlocale("RUSSIAN")
 
-	#include "Language Defines.h"
 	#if defined( RUSSIAN )
 		#include "text.h"
 		#include "Fileman.h"