Delete xrEngine/dedicated_server_only.h.

nitrocaster · nitrocaster · commit 77ba5646f54b · 2015-11-12T01:38:30.000+03:00
diff --git a/src/xrEngine/Device_Initialize.cpp b/src/xrEngine/Device_Initialize.cpp
@@ -1,7 +1,5 @@
 #include "stdafx.h"
 #include "resource.h"
-#include "dedicated_server_only.h"
-
 #ifdef INGAME_EDITOR
 # include "Include/editor/ide.hpp"
 # include "engine_impl.hpp"
diff --git a/src/xrEngine/Device_create.cpp b/src/xrEngine/Device_create.cpp
@@ -1,7 +1,6 @@
 #include "stdafx.h"
 #include "Include/xrRender/DrawUtils.h"
 #include "Render.h"
-#include "dedicated_server_only.h"
 #include "xrCDB/xrXRC.h"
 
 extern XRCDB_API BOOL* cdb_bDebug;
diff --git a/src/xrEngine/Engine.cpp b/src/xrEngine/Engine.cpp
@@ -4,7 +4,6 @@
 
 #include "stdafx.h"
 #include "Engine.h"
-#include "dedicated_server_only.h"
 
 CEngine Engine;
 
diff --git a/src/xrEngine/dedicated_server_only.h b/src/xrEngine/dedicated_server_only.h
diff --git a/src/xrEngine/no_single.h b/src/xrEngine/no_single.h
@@ -1,7 +1,2 @@
-#include "dedicated_server_only.h"
 
 //#define NO_SINGLE
-
-#ifdef DEDICATED_SERVER_ONLY
-# define NO_SINGLE
-#endif //#ifdef DEDICATED_SERVER_ONLY
diff --git a/src/xrEngine/x_ray.cpp b/src/xrEngine/x_ray.cpp
@@ -8,8 +8,6 @@
 #include "stdafx.h"
 #include "IGame_Level.h"
 #include "IGame_Persistent.h"
-
-#include "dedicated_server_only.h"
 #include "no_single.h"
 #include "xrNetServer/NET_AuthCheck.h"
 
diff --git a/src/xrEngine/xrEngine.vcxproj b/src/xrEngine/xrEngine.vcxproj
@@ -444,7 +444,6 @@
     <ClInclude Include="cf_dynamic_mesh.h" />
     <ClInclude Include="CopyProtection.h" />
     <ClInclude Include="CustomHUD.h" />
-    <ClInclude Include="dedicated_server_only.h" />
     <ClInclude Include="defines.h" />
     <ClInclude Include="device.h" />
     <ClInclude Include="editor_environment_ambients_ambient.hpp" />
diff --git a/src/xrEngine/xrEngine.vcxproj.filters b/src/xrEngine/xrEngine.vcxproj.filters
@@ -237,9 +237,6 @@
     <ClInclude Include="CopyProtection.h">
       <Filter>General</Filter>
     </ClInclude>
-    <ClInclude Include="dedicated_server_only.h">
-      <Filter>General</Filter>
-    </ClInclude>
     <ClInclude Include="defines.h">
       <Filter>General</Filter>
     </ClInclude>
diff --git a/src/xrGame/UIDialogHolder.h b/src/xrGame/UIDialogHolder.h
@@ -1,5 +1,4 @@
 #pragma once
-#include "xrEngine/dedicated_server_only.h"
 #include "xrEngine/no_single.h"
 
 class CUIDialogWnd;
diff --git a/src/xrGame/ai_space.cpp b/src/xrGame/ai_space.cpp
@@ -22,7 +22,6 @@
 #include "alife_simulator.h"
 #include "moving_objects.h"
 #include "doors_manager.h"
-#include "xrEngine/dedicated_server_only.h"
 #include "xrEngine/no_single.h"
 
 ENGINE_API  bool g_dedicated_server;
diff --git a/src/xrGame/game_sv_single.cpp b/src/xrGame/game_sv_single.cpp
@@ -9,7 +9,6 @@
 #include "gamepersistent.h"
 #include "xrServer.h"
 #include "xrEngine/x_ray.h"
-#include "xrEngine/dedicated_server_only.h"
 #include "xrEngine/no_single.h"
 
 game_sv_Single::game_sv_Single			()
diff --git a/src/xrServerEntities/object_factory_script.cpp b/src/xrServerEntities/object_factory_script.cpp
@@ -7,9 +7,6 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #include "pch_script.h"
-
-#ifndef DEDICATED_SERVER_ONLY
-
 #include "object_factory.h"
 #include "ai_space.h"
 #include "xrScriptEngine/script_engine.hpp"
@@ -107,5 +104,3 @@ SCRIPT_EXPORT(CObjectFactory, (),
 			.def("register",	(void (CObjectFactory::*)(LPCSTR,LPCSTR,LPCSTR))(&CObjectFactory::register_script_class))
 	];
 });
-
-#endif // #ifndef DEDICATED_SERVER_ONLY

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#pragma once`
`2`		`-#include "xrEngine/dedicated_server_only.h"`
`3`	`2`	`#include "xrEngine/no_single.h"`
`4`	`3`
`5`	`4`	`class CUIDialogWnd;`