From 5211988efbb7c84df9ed18e8a939eb390fceb0ee Mon Sep 17 00:00:00 2001 From: "Marco Antonio J. Costa" Date: Wed, 25 Dec 2024 07:00:41 -0300 Subject: [PATCH 1/2] remove Language Defines file we don't do it like that anymore, the build system takes care of it --- Ja2/CMakeLists.txt | 1 - Ja2/Language Defines.cpp | 21 ------- Ja2/Language Defines.h | 119 --------------------------------------- 3 files changed, 141 deletions(-) delete mode 100644 Ja2/Language Defines.cpp delete mode 100644 Ja2/Language Defines.h diff --git a/Ja2/CMakeLists.txt b/Ja2/CMakeLists.txt index d4b60792e..7f8806f90 100644 --- 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/Language Defines.cpp b/Ja2/Language Defines.cpp deleted file mode 100644 index 2c7be02dc..000000000 --- a/Ja2/Language Defines.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "Language Defines.h" - -#if defined(ENGLISH) -# pragma message(" (Language set to ENGLISH, You'll need english CDs)") -#elif defined(GERMAN) -# pragma message(" (Language set to GERMAN, You'll need Topware/german CDs)") -#elif defined(RUSSIAN) -# pragma message(" (Language set to RUSSIAN, You'll need russian CDs)") -#elif defined(DUTCH) -# pragma message(" (Language set to DUTCH, You'll need dutch CDs)") -#elif defined(POLISH) -# pragma message(" (Language set to POLISH, You'll need polish CDs)") -#elif defined(FRENCH) -# pragma message(" (Language set to FRENCH, You'll need french CDs)") -#elif defined(ITALIAN) -# pragma message(" (Language set to ITALIAN, You'll need italian CDs)") -#elif defined(CHINESE) -# pragma message(" (Language set to CHINESE, You'll need chinese CDs)") -#else -# error "At least You have to specify a Language somewhere. See comments above." -#endif diff --git a/Ja2/Language Defines.h b/Ja2/Language Defines.h deleted file mode 100644 index 8032d6997..000000000 --- a/Ja2/Language Defines.h +++ /dev/null @@ -1,119 +0,0 @@ -#ifndef __LANGUAGE_DEFINES_H -#define __LANGUAGE_DEFINES_H - -#pragma once - -/* ============================================================================ - * ONLY ONE OF THESE LANGUAGES CAN BE DEFINED AT A TIME! - * BUT now You can define it _here_ by uncommenting one _or_ (better): - * You can comment them all out and then set it _global_ in "Preprocessor - * options" (do it for ALL projects in the workspace and both debug & release) - * _or_ - * give it do Your MAKEFILE, f.i. make ENGLISH, but keep in mind that some - * weird make tools will require 'make ENGLISH=1' instead - * - * using one of the two later methods will keep this SVN file unchanged for the - * future, only Your private project files (workspace/solution) will differ - * from the SVN stuff. - * (2006-10-10, Sergeant_Kolja) - */ - - -/* The recommend approach for VS2010 multi-language builds is to use the command line or the ja2.props file. - - By default the language is ENGLISH and the Language Prefix is EN. - - There are 3 ways you can build the JA2 1.13 executable file: - - // ------------------------------------------------------- - // 1. Using the command line - // ------------------------------------------------------- - - For example, where msbuild is located in %SystemRoot%\Microsoft.NET\Framework\v4.0.30319\ if not on your path - msbuild.exe /p:Configuration=Release ja2_VS2010.sln - msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=PL /p:JA2Language=POLISH ja2_VS2010.sln - msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=DE /p:JA2Language=GERMAN ja2_VS2010.sln - msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=RU /p:JA2Language=RUSSIAN ja2_VS2010.sln - msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=NL /p:JA2Language=DUTCH ja2_VS2010.sln - msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=FR /p:JA2Language=FRENCH ja2_VS2010.sln - msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=IT /p:JA2Language=ITALIAN ja2_VS2010.sln - msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=CN /p:JA2Language=CHINESE ja2_VS2010.sln - - Note: If you want to build "Unfinished Business" version, just append the /p:JA2Config=JA2UB in the command line - msbuild.exe /p:Configuration=Release /p:JA2Config=JA2UB ja2_VS2010.sln - msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=DE /p:JA2Language=GERMAN /p:JA2Config=JA2UB ja2_VS2010.sln - - Note2: You can also specify the target output name with the parameter /p:TargetName - msbuild.exe /p:Configuration=Release /p:JA2LangPrefix=DE /p:JA2Language=GERMAN /p:JA2Config=JA2UB /p:TargetName="JA2UB_113" ja2_VS2010.sln - - // -------------------------------------------------------- - // 2. Editing the ja2.props file and then build in VS 2010 - // ------------------------------------------------------- - - 1. Open the "ja2.props" file in a text editor and set the tags to your likeing. - - For example: If you want to build Russian Version (normal JA2, not UB) then set the following: - - - - - - RU - - - RUSSIAN - - - 2. Save the file - 3. Build the project in Visual Studio 2010 - - // -------------------------------------------------------- - // 3. The "old" way for building the executable - // ------------------------------------------------------- - - 1. Enable the "#undef ENGLISH" define below, so English will not be used anymore - 2. Set the desired language below - 3. If you want to build "Unfinished Business" version, enable "#define JA2UB" and "#define JA2UBMAPS" in builddefines.h" - 4. Build the executable in VS 2005 / 2008 / 2010 - 5. The output will be placed in the "Build\bin\" folder -*/ - -// Only enable this "undef", if you use the 3. way of building the executable! -#undef ENGLISH - -#if !defined(ENGLISH) && !defined(GERMAN) && !defined(RUSSIAN) && !defined(DUTCH) && !defined(POLISH) && !defined(FRENCH) && !defined(ITALIAN) && !defined(CHINESE) -/* please set one manually here (by uncommenting) if not willingly to set Workspace wide */ - -#define ENGLISH -//#define GERMAN -//#define RUSSIAN -//#define DUTCH -//#define FRENCH -//#define ITALIAN -//#define POLISH - -// INFO: For Chinese 1.13 version, you also have to set USE_WINFONTS = 1 in ja2.ini inside your JA2 installation directory! -//#define CHINESE - -#endif - -//**ddd direct link libraries -#pragma comment (lib, "user32.lib") -#pragma comment (lib, "gdi32.lib") -#pragma comment (lib, "advapi32.lib") -#pragma comment (lib, "shell32.lib") - -/* ==================================================================== - * Regardless of if we did it Workspace wide or by uncommenting above, - * HERE we must see, what language was selected. If one, we - */ -#if !defined(ENGLISH) && !defined(GERMAN) && !defined(RUSSIAN) && !defined(DUTCH) && !defined(POLISH) && !defined(FRENCH) && !defined(ITALIAN) && !defined(CHINESE) -# error "At least You have to specify a Language somewhere. See comments above." -#endif - -//if the language represents words as single chars -/*#ifdef TAIWAN - #define SINGLE_CHAR_WORDS -#endif*/ - -#endif From 40dc778b2d54a5aa60fb8904cae3809c79e2aef8 Mon Sep 17 00:00:00 2001 From: "Marco Antonio J. Costa" Date: Wed, 25 Dec 2024 07:01:01 -0300 Subject: [PATCH 2/2] remove all #include's for Language Defines scripted diff: find . -type f -iname "*.h" -exec sed -i -E '/#include.*language\ defines\.h/I d' {} \; find . -type f -iname "*.cpp" -exec sed -i -E '/#include.*language\ defines\.h/I d' {} \; --- Ja2/Cheats.h | 1 - Ja2/Credits.cpp | 1 - Ja2/FeaturesScreen.cpp | 1 - Ja2/GameSettings.cpp | 1 - Ja2/Options Screen.cpp | 1 - Ja2/builddefines.h | 2 -- Ja2/jascreens.cpp | 1 - Laptop/AimMembers.cpp | 1 - Tactical/Interface Enhanced.cpp | 1 - Tactical/Interface Items.cpp | 1 - Utils/Encrypted File.cpp | 1 - Utils/ImportStrings.cpp | 1 - Utils/Multi Language Graphic Utils.cpp | 1 - Utils/Multilingual Text Code Generator.cpp | 1 - Utils/Utils All.h | 1 - Utils/_ChineseText.cpp | 1 - Utils/_DutchText.cpp | 1 - Utils/_EnglishText.cpp | 1 - Utils/_FrenchText.cpp | 1 - Utils/_GermanText.cpp | 1 - Utils/_ItalianText.cpp | 1 - Utils/_Ja25ChineseText.cpp | 1 - Utils/_Ja25DutchText.cpp | 1 - Utils/_Ja25EnglishText.cpp | 1 - Utils/_Ja25FrenchText.cpp | 1 - Utils/_Ja25GermanText.cpp | 1 - Utils/_Ja25ItalianText.cpp | 1 - Utils/_Ja25PolishText.cpp | 1 - Utils/_Ja25RussianText.cpp | 1 - Utils/_PolishText.cpp | 1 - Utils/_RussianText.cpp | 1 - 31 files changed, 32 deletions(-) diff --git a/Ja2/Cheats.h b/Ja2/Cheats.h index 74760ab63..2cd58cd15 100644 --- 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 index 7a1f8d250..f2d1fdeb8 100644 --- 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 index 92d0b60fc..50535f97b 100644 --- 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 index 054da671a..35f99674a 100644 --- 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/Options Screen.cpp b/Ja2/Options Screen.cpp index 43fd9b1f5..6a9ce3d1c 100644 --- 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 index 5e48f5060..eb71defee 100644 --- 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 index b1dfe4e84..4e1d8897c 100644 --- 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 index 02d806cbe..05d631519 100644 --- 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 index c6eee82ca..f992338ca 100644 --- 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 index 18f635db6..78f7933d1 100644 --- 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 index 16886459b..20fba5448 100644 --- 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 index 1d4131c44..cbe3a711c 100644 --- a/Utils/ImportStrings.cpp +++ b/Utils/ImportStrings.cpp @@ -1,6 +1,5 @@ #include "ImportStrings.h" #include "LocalizedStrings.h" -#include "Language Defines.h" #include #include diff --git a/Utils/Multi Language Graphic Utils.cpp b/Utils/Multi Language Graphic Utils.cpp index 102c7d3f1..4d444fb93 100644 --- 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 index 256f9280b..2bdfcb2a2 100644 --- 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 #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 index 208f49907..3b6750c66 100644 --- 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 index 46845d9db..622b69f5b 100644 --- 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 index c6ddf46a9..976ea8022 100644 --- 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 index 91d157434..0f5f947ef 100644 --- 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 index fb8e314b6..6a259577b 100644 --- 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 index 721d099f6..53bb26017 100644 --- 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 index 58a63f5cf..6f9cbb102 100644 --- 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 index 919f2d14e..1bfcf23e3 100644 --- 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 index a22348620..396f8ac54 100644 --- 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 index b58a080d4..70a0c7e2e 100644 --- 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 index f20af04a0..17f9fa2a5 100644 --- 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 index b402f4107..663aba593 100644 --- 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 index 4ffb9454f..06d7f2981 100644 --- 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 index 9446a5b21..f78354026 100644 --- 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 index 8ce7b35f7..77e48edd7 100644 --- 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 index 860c28873..8445de0de 100644 --- 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 index 62b72e2fd..110c38e79 100644 --- 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"