Include xrAPI.h in the common engine header

Cleanup other files

Author: Xottab-DUTY

src/Common/Common.hpp

@@ -1,4 +1,4 @@
 #pragma once
 
 #include "Common/CommonImportExport.inl"
-
+#include "Include/xrAPI/xrAPI.h"

src/Include/xrRender/FactoryPtr.h

@@ -1,9 +1,6 @@
-#ifndef FactoryPtr_included
-#define FactoryPtr_included
 #pragma once
 
 #include "RenderFactory.h"
-#include "Include/xrAPI/xrAPI.h"
 
 #define FACTORY_PTR_INSTANCIATE(Class)\
     template <>\
@@ -83,5 +80,3 @@ void FactoryPtr<IStatsRender>::DestroyObject(void)
     m_pObject = NULL;
 }
 */
-
-#endif // FactoryPtr_included

src/Layers/xrRender/HW.cpp

@@ -85,8 +85,6 @@ void CHW::Reset(HWND hwnd)
 #endif
 }
 
-#include "Include/xrAPI/xrAPI.h"
-
 void CHW::CreateD3D()
 {
     const pcstr _name = GEnv.isDedicatedServer ? "xrD3D9-Null" : "d3d9.dll";

src/Layers/xrRenderDX10/dx10HW.cpp

@@ -2,7 +2,6 @@
 //////////////////////////////////////////////////////////////////////
 
 #include "stdafx.h"
-#pragma hdrstop
 
 #pragma warning(push)
 #pragma warning(disable : 4995)
@@ -11,10 +10,9 @@
 
 #include "Layers/xrRender/HW.h"
 #include "xrEngine/XR_IOConsole.h"
-#include "Include/xrAPI/xrAPI.h"
 
-#include "StateManager\dx10SamplerStateCache.h"
-#include "StateManager\dx10StateCache.h"
+#include "StateManager/dx10SamplerStateCache.h"
+#include "StateManager/dx10StateCache.h"
 
 #ifndef _EDITOR
 void fill_vid_mode_list(CHW* _hw);
@@ -31,7 +29,7 @@ void free_render_mode_list() {}
 
 CHW HW;
 
-//  DX10: Don't neeed this?
+//  DX10: Don't need this?
 /*
 #ifdef DEBUG
 IDirect3DStateBlock9*   dwDebugSB = 0;

src/xrAICore/AISpaceBase.cpp

@@ -4,7 +4,6 @@
 #include "Navigation/level_graph.h"
 #include "Navigation/graph_engine.h"
 #include "Navigation/PatrolPath/patrol_path_storage.h"
-#include "Include/xrAPI/xrAPI.h"
 
 AISpaceBase::AISpaceBase() { GEnv.AISpace = this; }
 AISpaceBase::~AISpaceBase()

src/xrAICore/Navigation/PatrolPath/patrol_path_params.cpp

@@ -12,7 +12,6 @@
 #include "xrScriptEngine/script_engine.hpp"
 #include "xrScriptEngine/DebugMacros.hpp" // for THROW3 // XXX: move debug macros to xrCore
 #include "AISpaceBase.hpp"
-#include "Include/xrAPI/xrAPI.h"
 
 CPatrolPathParams::CPatrolPathParams(LPCSTR caPatrolPathToGo, EPatrolStartType tPatrolPathStart,
     EPatrolRouteType tPatrolPathStop, bool bRandom, u32 index)

src/xrAICore/Navigation/PatrolPath/patrol_point.cpp

@@ -15,7 +15,6 @@
 #include "Common/object_broker.h"
 #include "xrScriptEngine/DebugMacros.hpp"
 #include "AISpaceBase.hpp"
-#include "Include/xrAPI/xrAPI.h"
 #ifdef DEBUG
 #include "Navigation/PatrolPath/patrol_path.h"
 #endif

src/xrAICore/Navigation/game_graph_script.cpp

@@ -10,7 +10,6 @@
 #include "game_graph.h"
 #include "xrScriptEngine/ScriptExporter.hpp"
 #include "xrScriptEngine/DebugMacros.hpp" // for THROW // XXX: move debug macros to xrCore
-#include "Include/xrAPI/xrAPI.h"
 #include "AISpaceBase.hpp"
 
 using namespace luabind;

src/xrEngine/GameFont.cpp

@@ -9,7 +9,6 @@
 extern ENGINE_API BOOL g_bRendering;
 ENGINE_API Fvector2 g_current_font_scale = {1.0f, 1.0f};
 
-#include "Include/xrAPI/xrAPI.h"
 #include "Include/xrRender/RenderFactory.h"
 #include "Include/xrRender/FontRender.h"
 

src/xrEngine/GameMtlLib.h

@@ -337,5 +337,3 @@ class MTL_EXPORT_API CGameMtlLibrary
 };
 
 extern MTL_EXPORT_API CGameMtlLibrary GMLib;
-
-#include "Include/xrAPI/xrAPI.h"