Include Config.hpp in Common.hpp

OpenXRay · Dec 12, 2017 · e6253a5 · e6253a5
1 parent 0b7065b
commit e6253a5
Show file tree

Hide file tree

Showing 18 changed files with 1 addition and 29 deletions.
diff --git a/src/Common/Common.hpp b/src/Common/Common.hpp
@@ -1,4 +1,5 @@
 #pragma once
 
+#include "Common/Config.hpp"
 #include "Common/CommonImportExport.inl"
 #include "Include/xrAPI/xrAPI.h"
diff --git a/src/Common/Platform.hpp b/src/Common/Platform.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "Common/Config.hpp"
 
 #if defined(__linux__)
 #define LINUX

diff --git a/src/Layers/xrRender/DetailManager.h b/src/Layers/xrRender/DetailManager.h
@@ -9,7 +9,6 @@
 #include "xrCore/xrPool.h"
 #include "DetailFormat.h"
 #include "DetailModel.h"
-#include "Common/Config.hpp"
 
 #ifdef _EDITOR
 //.	#include	"ESceneClassList.h"

diff --git a/src/Layers/xrRender/FTreeVisual.cpp b/src/Layers/xrRender/FTreeVisual.cpp
@@ -7,8 +7,6 @@
 #include "xrCore/FMesh.hpp"
 #include "FTreeVisual.h"
 
-#include "Common/Config.hpp"
-
 shared_str m_xform;
 shared_str m_xform_v;
 shared_str c_consts;

diff --git a/src/Layers/xrRender/xrRender_console.cpp b/src/Layers/xrRender/xrRender_console.cpp
@@ -2,7 +2,6 @@
 #pragma hdrstop
 
 #include "xrRender_console.h"
-#include "Common/Config.hpp"
 
 u32 ps_Preset = 2;
 xr_token qpreset_token[] = {{"Minimum", 0}, {"Low", 1}, {"Default", 2}, {"High", 3}, {"Extreme", 4}, {nullptr, 0}};

diff --git a/src/Layers/xrRenderPC_R2/r2.cpp b/src/Layers/xrRenderPC_R2/r2.cpp
@@ -12,8 +12,6 @@
 #include "Layers/xrRender/dxWallMarkArray.h"
 #include "Layers/xrRender/dxUIShader.h"
 
-#include "Common/Config.hpp"
-
 CRender RImplementation;
 
 //////////////////////////////////////////////////////////////////////////

diff --git a/src/Layers/xrRenderPC_R3/r3.cpp b/src/Layers/xrRenderPC_R3/r3.cpp
@@ -14,8 +14,6 @@
 #include "Layers/xrRenderDX10/3DFluid/dx103DFluidManager.h"
 #include "D3DX10Core.h"
 
-#include "Common/Config.hpp"
-
 CRender RImplementation;
 
 //////////////////////////////////////////////////////////////////////////

diff --git a/src/Layers/xrRenderPC_R4/r4.cpp b/src/Layers/xrRenderPC_R4/r4.cpp
@@ -15,8 +15,6 @@
 #include "Layers/xrRender/ShaderResourceTraits.h"
 #include "D3DX10Core.h"
 
-#include "Common/Config.hpp"
-
 CRender RImplementation;
 
 //////////////////////////////////////////////////////////////////////////

diff --git a/src/xrEngine/Environment.cpp b/src/xrEngine/Environment.cpp
@@ -23,8 +23,6 @@
 #include "Include/xrRender/RainRender.h"
 #include "Include/xrRender/ThunderboltRender.h"
 
-#include "Common/Config.hpp"
-
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////

diff --git a/src/xrEngine/Environment.h b/src/xrEngine/Environment.h
@@ -9,8 +9,6 @@
 #include "xrCommon/xr_vector.h"
 #include "xrCommon/xr_map.h"
 
-#include "Common/Config.hpp"
-
 // refs
 class ENGINE_API IRender_Visual;
 class ENGINE_API CInifile;

diff --git a/src/xrEngine/Environment_misc.cpp b/src/xrEngine/Environment_misc.cpp
@@ -10,8 +10,6 @@
 #include "Common/object_broker.h"
 #include "Common/LevelGameDef.h"
 
-#include "Common/Config.hpp"
-
 void CEnvModifier::load(IReader* fs, u32 version)
 {
     use_flags.one();

diff --git a/src/xrEngine/device.cpp b/src/xrEngine/device.cpp
@@ -28,8 +28,6 @@
 #include "IGame_Persistent.h"
 #include "xrScriptEngine/ScriptExporter.hpp"
 
-#include "Common/Config.hpp"
-
 ENGINE_API CRenderDevice Device;
 ENGINE_API CLoadScreenRenderer load_screen_renderer;
 

diff --git a/src/xrGame/Actor.cpp b/src/xrGame/Actor.cpp
@@ -73,8 +73,6 @@
 #include "ActorHelmet.h"
 #include "UI/UIDragDropReferenceList.h"
 
-#include "Common/Config.hpp"
-
 const u32 patch_frames = 50;
 const float respawn_delay = 1.f;
 const float respawn_auto = 7.f;

diff --git a/src/xrGame/CharacterPhysicsSupport.cpp b/src/xrGame/CharacterPhysicsSupport.cpp
@@ -32,8 +32,6 @@
 #include "activatingcharcollisiondelay.h"
 #include "stalker_movement_manager_smart_cover.h"
 
-#include "Common/Config.hpp"
-
 // const float default_hinge_friction = 5.f;//gray_wolf comment
 #ifdef DEBUG
 #include "PHDebug.h"

diff --git a/src/xrGame/HudItem.cpp b/src/xrGame/HudItem.cpp
@@ -11,7 +11,6 @@
 #include "player_hud.h"
 #include "xrCore/Animation/SkeletonMotions.hpp"
 
-#include "Common/Config.hpp"
 #include "ui_base.h"
 
 CHudItem::CHudItem()

diff --git a/src/xrGame/Level_input.cpp b/src/xrGame/Level_input.cpp
@@ -24,7 +24,6 @@
 
 #include "Include/xrRender/DebugRender.h"
 
-#include "Common/Config.hpp"
 
 #ifdef DEBUG
 #include "ai/monsters/BaseMonster/base_monster.h"

diff --git a/src/xrGame/WeaponMagazined.cpp b/src/xrGame/WeaponMagazined.cpp
@@ -23,8 +23,6 @@
 #include "script_game_object.h"
 #include "HudSound.h"
 
-#include "Common/Config.hpp"
-
 CUIXml* pWpnScopeXml = nullptr;
 
 void createWpnScopeXML()

diff --git a/src/xrGame/WeaponMagazinedWGrenade.cpp b/src/xrGame/WeaponMagazinedWGrenade.cpp
@@ -13,8 +13,6 @@
 #include "xrPhysics/MathUtils.h"
 #include "player_hud.h"
 
-#include "Common/Config.hpp"
-
 #ifdef DEBUG
 #include "PHDebug.h"
 #endif