From d5457819bf17e7b4618af6142ad8c5f51c7cfe9a Mon Sep 17 00:00:00 2001 From: nitrocaster Date: Sat, 3 Oct 2015 00:41:58 +0300 Subject: [PATCH] Delete unused/duplicated sources. --- src/{Include => common}/FSMacros.hpp | 0 src/common/Util.hpp | 17 +++++ src/utils/xrAI/StdAfx.h | 1 - src/utils/xrAI/cl_collector.cpp | 12 --- src/utils/xrAI/cl_collector.h | 9 --- src/utils/xrAI/defines.h | 31 -------- src/utils/xrAI/light.h | 16 ---- src/utils/xrAI/std_classes.h | 53 ------------- src/utils/xrAI/xrAI.vcxproj | 6 -- src/utils/xrAI/xrAI.vcxproj.filters | 24 ------ src/utils/xrAI/xrCrossTable.cpp | 1 - src/utils/xrDO_Light/StdAfx.h | 1 - src/utils/xrDO_Light/defines.h | 31 -------- src/utils/xrDO_Light/std_classes.h | 53 ------------- src/utils/xrDO_Light/xrDO_Light.vcxproj | 2 - .../xrDO_Light/xrDO_Light.vcxproj.filters | 12 --- src/utils/xrLC/StdAfx.h | 2 +- src/utils/xrLC/defines.h | 31 -------- src/utils/xrLC/xrLC.cpp | 1 + src/utils/xrLC/xrLC.vcxproj | 1 - src/utils/xrLC/xrLC.vcxproj.filters | 3 - src/utils/xrSE_Factory/defines.h | 75 ------------------- src/utils/xrSE_Factory/xrSE_Factory.vcxproj | 1 - .../xrSE_Factory/xrSE_Factory.vcxproj.filters | 3 - src/xrEngine/GameMtlLib.cpp | 2 +- src/xrEngine/defines.h | 10 +-- src/xrNetServer/stdafx.h | 3 - .../xrServer_Objects_ALife.cpp | 1 - 28 files changed, 22 insertions(+), 380 deletions(-) rename src/{Include => common}/FSMacros.hpp (100%) delete mode 100644 src/utils/xrAI/cl_collector.cpp delete mode 100644 src/utils/xrAI/cl_collector.h delete mode 100644 src/utils/xrAI/defines.h delete mode 100644 src/utils/xrAI/light.h delete mode 100644 src/utils/xrAI/std_classes.h delete mode 100644 src/utils/xrDO_Light/defines.h delete mode 100644 src/utils/xrDO_Light/std_classes.h delete mode 100644 src/utils/xrLC/defines.h delete mode 100644 src/utils/xrSE_Factory/defines.h diff --git a/src/Include/FSMacros.hpp b/src/common/FSMacros.hpp similarity index 100% rename from src/Include/FSMacros.hpp rename to src/common/FSMacros.hpp diff --git a/src/common/Util.hpp b/src/common/Util.hpp index 8f193c8a22d..8477372e950 100644 --- a/src/common/Util.hpp +++ b/src/common/Util.hpp @@ -5,3 +5,20 @@ inline TEnum operator&(TEnum a, TEnum b) { return (TEnum)((TBaseType)a & (TBaseType)b); } \ inline TEnum& operator|=(TEnum& a, TEnum b) { return a = a | b; } \ inline TEnum& operator&=(TEnum& a, TEnum b) { return a = a & b; } + +#define _RELEASE(x) \ +{ \ + if ((x)) \ + { \ + (x)->Release(); \ + (x) = nullptr; \ + } \ +} +#define _SHOW_REF(msg, x) \ +{ \ + if ((x)) \ + { \ + (x)->AddRef(); \ + Log(msg, u32((x)->Release())); \ + } \ +} diff --git a/src/utils/xrAI/StdAfx.h b/src/utils/xrAI/StdAfx.h index c9c06c97461..8ba918c24b6 100644 --- a/src/utils/xrAI/StdAfx.h +++ b/src/utils/xrAI/StdAfx.h @@ -19,7 +19,6 @@ #define ECORE_API #define XR_EPROPS_API #include "xrCore/clsid.h" -#include "defines.h" #include "xrCDB/xrCDB.h" #include "Common/_d3d_extensions.h" diff --git a/src/utils/xrAI/cl_collector.cpp b/src/utils/xrAI/cl_collector.cpp deleted file mode 100644 index 69966916e73..00000000000 --- a/src/utils/xrAI/cl_collector.cpp +++ /dev/null @@ -1,12 +0,0 @@ -// cl_collector.cpp: implementation of the Collector class. -// -////////////////////////////////////////////////////////////////////// - -#include "stdafx.h" -#pragma hdrstop - -#include "cl_collector.h" - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// diff --git a/src/utils/xrAI/cl_collector.h b/src/utils/xrAI/cl_collector.h deleted file mode 100644 index 85b72fbac85..00000000000 --- a/src/utils/xrAI/cl_collector.h +++ /dev/null @@ -1,9 +0,0 @@ -// cl_collector.h: interface for the Collector class. -// -////////////////////////////////////////////////////////////////////// - -#if !defined(AFX_CL_COLLECTOR_H__F107ABA0_E877_4C5A_8EFF_DAB3A86ABDB6__INCLUDED_) -#define AFX_CL_COLLECTOR_H__F107ABA0_E877_4C5A_8EFF_DAB3A86ABDB6__INCLUDED_ -#pragma once - -#endif // !defined(AFX_CL_COLLECTOR_H__F107ABA0_E877_4C5A_8EFF_DAB3A86ABDB6__INCLUDED_) diff --git a/src/utils/xrAI/defines.h b/src/utils/xrAI/defines.h deleted file mode 100644 index 3b185235736..00000000000 --- a/src/utils/xrAI/defines.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef _DEFINES_H_ -#define _DEFINES_H_ - -#define _RELEASE(x) { if(x) { (x)->Release(); (x)=NULL; } } -#define _SHOW_REF(msg, x) { VERIFY(x); x->AddRef(); DWORDToFile(msg,x->Release()); } -#define THROW throw 123456789 - -// game path definition -#define _game_data_ "$game_data$" -#define _game_textures_ "$game_textures$" -#define _game_levels_ "$game_levels$" -#define _game_sounds_ "$game_sounds$" -#define _game_meshes_ "$game_meshes$" -#define _game_shaders_ "$game_shaders$" - -// editor path definition -#define _server_root_ "$server_root$" -#define _server_data_root_ "$server_data_root$" -#define _local_root_ "$local_root$" -#define _import_ "$import$" -#define _sounds_ "$sounds$" -#define _textures_ "$textures$" -#define _objects_ "$objects$" -#define _maps_ "$maps$" -#define _temp_ "$temp$" -#define _omotion_ "$omotion$" -#define _omotions_ "$omotions$" -#define _smotion_ "$smotion$" -#define _detail_objects_ "$detail_objects$" - -#endif diff --git a/src/utils/xrAI/light.h b/src/utils/xrAI/light.h deleted file mode 100644 index 4c68488870f..00000000000 --- a/src/utils/xrAI/light.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef _XR_LIGHT_ -#define _XR_LIGHT_ -#pragma once - -#include "Common/_d3d_extensions.h" - -#pragma pack(push,4) -class xrLIGHT : public Flight -{ -public: - u32 dwFrame; - u32 dwController; -}; -#pragma pack(pop) - -#endif diff --git a/src/utils/xrAI/std_classes.h b/src/utils/xrAI/std_classes.h deleted file mode 100644 index 80a34b270cd..00000000000 --- a/src/utils/xrAI/std_classes.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef _STD_CLSID_ -#define _STD_CLSID_ - -#include "clsid.h" - -//***** Standart extension classes -#define CLSID_HUDMANAGER MK_CLSID('H','U','D','_','M','N','G','R') -#define CLSID_LEVEL MK_CLSID('C','R','E','A','T','O','R',' ') - -#define CLSID_TEXTURE MK_CLSID('T','E','X','T','U','R','E',' ') -#define CLSID_OBJECT MK_CLSID('O','B','J','E','C','T',' ',' ') - -// Actor -#define CLSID_OBJECT_ACTOR MK_CLSID('O','_','A','C','T','O','R',' ') -#define CLSID_OBJECT_ACTOR_NET MK_CLSID('R','_','A','C','T','O','R',' ') -#define CLSID_OBJECT_DUMMY MK_CLSID('O','_','D','U','M','M','Y',' ') -#define CLSID_ENTITY MK_CLSID('E','N','T','I','T','Y',' ',' ') -#define CLSID_AI_HUMAN MK_CLSID('A','I','_','H','U','M','A','N') - -#define CLSID_OBJECT_DACTOR MK_CLSID('O','_','D','E','M','O',' ',' ') - -#define CLSID_EVENT MK_CLSID('E','V','E','N','T',' ',' ',' ') -#define CLSID_OBJECT_FLYER MK_CLSID('O','_','F','L','Y','E','R',' ') -#define CLSID_OBJECT_DOOR MK_CLSID('O','_','D','O','O','R',' ',' ') -#define CLSID_OBJECT_LIFT MK_CLSID('O','_','L','I','F','T',' ',' ') - -// Weapons -#define CLSID_OBJECT_W_M134 MK_CLSID('W','_','M','1','3','4',' ',' ') -#define CLSID_OBJECT_W_M134_en MK_CLSID('W','_','M','1','3','4','e','n') -#define CLSID_OBJECT_W_GROZA MK_CLSID('W','_','G','R','O','Z','A',' ') -#define CLSID_OBJECT_W_PROTECTA MK_CLSID('W','_','P','R','O','T',' ',' ') -#define CLSID_OBJECT_W_RAIL MK_CLSID('W','_','R','A','I','L',' ',' ') -#define CLSID_OBJECT_W_ROCKET MK_CLSID('W','_','R','O','C','K','E','T') - -// Weapons Ammo -#define CLSID_OBJECT_A_M134 MK_CLSID('A','_','M','1','3','4',' ',' ') -#define CLSID_OBJECT_A_GROZA MK_CLSID('A','_','G','R','O','Z','A',' ') -#define CLSID_OBJECT_A_PROTECTA MK_CLSID('A','_','P','R','O','T',' ',' ') -#define CLSID_OBJECT_A_RAIL MK_CLSID('A','_','R','A','I','L',' ',' ') -#define CLSID_OBJECT_A_ROCKET MK_CLSID('A','_','R','O','C','K','E','T') - -// Modifiers -#define CLSID_OBJECT_M_QDAMAGE MK_CLSID('O','_','Q','D','M','G',' ',' ') -#define CLSID_OBJECT_M_IMMORTAL MK_CLSID('O','_','I','M','M','O','R','T') -#define CLSID_OBJECT_M_INVIS MK_CLSID('O','_','I','N','V','I','S',' ') - -#define CLSID_OBJECT_HEALTH MK_CLSID('O','_','H','E','A','L','T','H') -#define CLSID_OBJECT_ARMOR MK_CLSID('O','_','A','R','M','O','R',' ') - -// Standart level object -#define CLSID_OBJECT_ITEM_STD MK_CLSID('O','_','I','T','E','M',' ',' ') - -#endif diff --git a/src/utils/xrAI/xrAI.vcxproj b/src/utils/xrAI/xrAI.vcxproj index ac9bdb48a2a..fc0c43d34c7 100644 --- a/src/utils/xrAI/xrAI.vcxproj +++ b/src/utils/xrAI/xrAI.vcxproj @@ -243,7 +243,6 @@ - AssemblyAndSourceCode AssemblyAndSourceCode @@ -347,7 +346,6 @@ - @@ -361,14 +359,12 @@ - - @@ -396,7 +392,6 @@ - @@ -444,7 +439,6 @@ - diff --git a/src/utils/xrAI/xrAI.vcxproj.filters b/src/utils/xrAI/xrAI.vcxproj.filters index eebf2b01289..17b084211ea 100644 --- a/src/utils/xrAI/xrAI.vcxproj.filters +++ b/src/utils/xrAI/xrAI.vcxproj.filters @@ -13,12 +13,6 @@ {d7047094-b5bb-4398-830d-7f17b82d8030} - - {a4c402e3-d51e-4459-a697-a90c8a83326c} - - - {603dd521-961a-4462-88bc-e692a9417ddc} - {1e4ce8af-06dd-4be3-877a-082bbb1fac8a} @@ -273,9 +267,6 @@ Compiler\Kernel - - Compiler\Kernel\Generic\CDB - Compiler\Kernel\Random32 @@ -410,9 +401,6 @@ Compiler\Kernel - - Compiler\Kernel - Compiler\Kernel @@ -425,18 +413,6 @@ Compiler\Kernel - - Compiler\Kernel\Generic - - - Compiler\Kernel\Generic - - - Compiler\Kernel\Generic - - - Compiler\Kernel\Generic\CDB - Compiler\Kernel\Random32 diff --git a/src/utils/xrAI/xrCrossTable.cpp b/src/utils/xrAI/xrCrossTable.cpp index 39c2a127353..33efe108231 100644 --- a/src/utils/xrAI/xrCrossTable.cpp +++ b/src/utils/xrAI/xrCrossTable.cpp @@ -7,7 +7,6 @@ //////////////////////////////////////////////////////////////////////////// #include "stdafx.h" -#include "defines.h" #include "xrCrossTable.h" LPCSTR GAME_LEVEL_GRAPH = "level.graph"; diff --git a/src/utils/xrDO_Light/StdAfx.h b/src/utils/xrDO_Light/StdAfx.h index 7c381ca94b2..519d43e3e41 100644 --- a/src/utils/xrDO_Light/StdAfx.h +++ b/src/utils/xrDO_Light/StdAfx.h @@ -19,7 +19,6 @@ #define ECORE_API #define XR_EPROPS_API #include "xrCore/clsid.h" -#include "defines.h" #include "xrCDB/xrCDB.h" #include "Common/_d3d_extensions.h" diff --git a/src/utils/xrDO_Light/defines.h b/src/utils/xrDO_Light/defines.h deleted file mode 100644 index 3b185235736..00000000000 --- a/src/utils/xrDO_Light/defines.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef _DEFINES_H_ -#define _DEFINES_H_ - -#define _RELEASE(x) { if(x) { (x)->Release(); (x)=NULL; } } -#define _SHOW_REF(msg, x) { VERIFY(x); x->AddRef(); DWORDToFile(msg,x->Release()); } -#define THROW throw 123456789 - -// game path definition -#define _game_data_ "$game_data$" -#define _game_textures_ "$game_textures$" -#define _game_levels_ "$game_levels$" -#define _game_sounds_ "$game_sounds$" -#define _game_meshes_ "$game_meshes$" -#define _game_shaders_ "$game_shaders$" - -// editor path definition -#define _server_root_ "$server_root$" -#define _server_data_root_ "$server_data_root$" -#define _local_root_ "$local_root$" -#define _import_ "$import$" -#define _sounds_ "$sounds$" -#define _textures_ "$textures$" -#define _objects_ "$objects$" -#define _maps_ "$maps$" -#define _temp_ "$temp$" -#define _omotion_ "$omotion$" -#define _omotions_ "$omotions$" -#define _smotion_ "$smotion$" -#define _detail_objects_ "$detail_objects$" - -#endif diff --git a/src/utils/xrDO_Light/std_classes.h b/src/utils/xrDO_Light/std_classes.h deleted file mode 100644 index 80a34b270cd..00000000000 --- a/src/utils/xrDO_Light/std_classes.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef _STD_CLSID_ -#define _STD_CLSID_ - -#include "clsid.h" - -//***** Standart extension classes -#define CLSID_HUDMANAGER MK_CLSID('H','U','D','_','M','N','G','R') -#define CLSID_LEVEL MK_CLSID('C','R','E','A','T','O','R',' ') - -#define CLSID_TEXTURE MK_CLSID('T','E','X','T','U','R','E',' ') -#define CLSID_OBJECT MK_CLSID('O','B','J','E','C','T',' ',' ') - -// Actor -#define CLSID_OBJECT_ACTOR MK_CLSID('O','_','A','C','T','O','R',' ') -#define CLSID_OBJECT_ACTOR_NET MK_CLSID('R','_','A','C','T','O','R',' ') -#define CLSID_OBJECT_DUMMY MK_CLSID('O','_','D','U','M','M','Y',' ') -#define CLSID_ENTITY MK_CLSID('E','N','T','I','T','Y',' ',' ') -#define CLSID_AI_HUMAN MK_CLSID('A','I','_','H','U','M','A','N') - -#define CLSID_OBJECT_DACTOR MK_CLSID('O','_','D','E','M','O',' ',' ') - -#define CLSID_EVENT MK_CLSID('E','V','E','N','T',' ',' ',' ') -#define CLSID_OBJECT_FLYER MK_CLSID('O','_','F','L','Y','E','R',' ') -#define CLSID_OBJECT_DOOR MK_CLSID('O','_','D','O','O','R',' ',' ') -#define CLSID_OBJECT_LIFT MK_CLSID('O','_','L','I','F','T',' ',' ') - -// Weapons -#define CLSID_OBJECT_W_M134 MK_CLSID('W','_','M','1','3','4',' ',' ') -#define CLSID_OBJECT_W_M134_en MK_CLSID('W','_','M','1','3','4','e','n') -#define CLSID_OBJECT_W_GROZA MK_CLSID('W','_','G','R','O','Z','A',' ') -#define CLSID_OBJECT_W_PROTECTA MK_CLSID('W','_','P','R','O','T',' ',' ') -#define CLSID_OBJECT_W_RAIL MK_CLSID('W','_','R','A','I','L',' ',' ') -#define CLSID_OBJECT_W_ROCKET MK_CLSID('W','_','R','O','C','K','E','T') - -// Weapons Ammo -#define CLSID_OBJECT_A_M134 MK_CLSID('A','_','M','1','3','4',' ',' ') -#define CLSID_OBJECT_A_GROZA MK_CLSID('A','_','G','R','O','Z','A',' ') -#define CLSID_OBJECT_A_PROTECTA MK_CLSID('A','_','P','R','O','T',' ',' ') -#define CLSID_OBJECT_A_RAIL MK_CLSID('A','_','R','A','I','L',' ',' ') -#define CLSID_OBJECT_A_ROCKET MK_CLSID('A','_','R','O','C','K','E','T') - -// Modifiers -#define CLSID_OBJECT_M_QDAMAGE MK_CLSID('O','_','Q','D','M','G',' ',' ') -#define CLSID_OBJECT_M_IMMORTAL MK_CLSID('O','_','I','M','M','O','R','T') -#define CLSID_OBJECT_M_INVIS MK_CLSID('O','_','I','N','V','I','S',' ') - -#define CLSID_OBJECT_HEALTH MK_CLSID('O','_','H','E','A','L','T','H') -#define CLSID_OBJECT_ARMOR MK_CLSID('O','_','A','R','M','O','R',' ') - -// Standart level object -#define CLSID_OBJECT_ITEM_STD MK_CLSID('O','_','I','T','E','M',' ',' ') - -#endif diff --git a/src/utils/xrDO_Light/xrDO_Light.vcxproj b/src/utils/xrDO_Light/xrDO_Light.vcxproj index fa4a23238c0..79f9c870948 100644 --- a/src/utils/xrDO_Light/xrDO_Light.vcxproj +++ b/src/utils/xrDO_Light/xrDO_Light.vcxproj @@ -212,9 +212,7 @@ - - diff --git a/src/utils/xrDO_Light/xrDO_Light.vcxproj.filters b/src/utils/xrDO_Light/xrDO_Light.vcxproj.filters index b20cc662e64..ad7d97c19ba 100644 --- a/src/utils/xrDO_Light/xrDO_Light.vcxproj.filters +++ b/src/utils/xrDO_Light/xrDO_Light.vcxproj.filters @@ -4,23 +4,11 @@ {b29b8dd4-9ba8-4204-a99d-bdf18bdb8b47} - - {52b2e43c-206f-4587-88fb-7eb7c9c3ec68} - - - {cb3862d8-630a-4488-a806-7327a1fdb68d} - - - Kernel - Kernel - - Kernel\Generic - diff --git a/src/utils/xrLC/StdAfx.h b/src/utils/xrLC/StdAfx.h index 8d3a947c795..5f94823d6d6 100644 --- a/src/utils/xrLC/StdAfx.h +++ b/src/utils/xrLC/StdAfx.h @@ -7,7 +7,7 @@ #define ECORE_API // fake, to enable sharing with editors #define XR_EPROPS_API #include "xrCore/clsid.h" -#include "defines.h" + #include "utils/xrLCUtil/ILevelCompilerLogger.hpp" #include "utils/xrLCUtil/xrThread.hpp" #include "utils/xrLCUtil/cdecl_cast.hpp" diff --git a/src/utils/xrLC/defines.h b/src/utils/xrLC/defines.h deleted file mode 100644 index 3b185235736..00000000000 --- a/src/utils/xrLC/defines.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef _DEFINES_H_ -#define _DEFINES_H_ - -#define _RELEASE(x) { if(x) { (x)->Release(); (x)=NULL; } } -#define _SHOW_REF(msg, x) { VERIFY(x); x->AddRef(); DWORDToFile(msg,x->Release()); } -#define THROW throw 123456789 - -// game path definition -#define _game_data_ "$game_data$" -#define _game_textures_ "$game_textures$" -#define _game_levels_ "$game_levels$" -#define _game_sounds_ "$game_sounds$" -#define _game_meshes_ "$game_meshes$" -#define _game_shaders_ "$game_shaders$" - -// editor path definition -#define _server_root_ "$server_root$" -#define _server_data_root_ "$server_data_root$" -#define _local_root_ "$local_root$" -#define _import_ "$import$" -#define _sounds_ "$sounds$" -#define _textures_ "$textures$" -#define _objects_ "$objects$" -#define _maps_ "$maps$" -#define _temp_ "$temp$" -#define _omotion_ "$omotion$" -#define _omotions_ "$omotions$" -#define _smotion_ "$smotion$" -#define _detail_objects_ "$detail_objects$" - -#endif diff --git a/src/utils/xrLC/xrLC.cpp b/src/utils/xrLC/xrLC.cpp index 5c9d683d302..7985a9d0fae 100644 --- a/src/utils/xrLC/xrLC.cpp +++ b/src/utils/xrLC/xrLC.cpp @@ -3,6 +3,7 @@ #include "stdafx.h" #include "math.h" #include "build.h" +#include "Common/FSMacros.hpp" #include "utils/xrLC_Light/xrLC_GlobalData.h" #include "utils/xrLCUtil/LevelCompilerLoggerWindow.hpp" diff --git a/src/utils/xrLC/xrLC.vcxproj b/src/utils/xrLC/xrLC.vcxproj index cbc1b0c0179..72569b35cf6 100644 --- a/src/utils/xrLC/xrLC.vcxproj +++ b/src/utils/xrLC/xrLC.vcxproj @@ -235,7 +235,6 @@ - diff --git a/src/utils/xrLC/xrLC.vcxproj.filters b/src/utils/xrLC/xrLC.vcxproj.filters index 95475fd73ec..97f41c5bfce 100644 --- a/src/utils/xrLC/xrLC.vcxproj.filters +++ b/src/utils/xrLC/xrLC.vcxproj.filters @@ -39,9 +39,6 @@ - - Kernel - Kernel diff --git a/src/utils/xrSE_Factory/defines.h b/src/utils/xrSE_Factory/defines.h deleted file mode 100644 index 0ec7919f77c..00000000000 --- a/src/utils/xrSE_Factory/defines.h +++ /dev/null @@ -1,75 +0,0 @@ -#ifndef DefinesH -#define DefinesH - -#ifdef DEBUG - ENGINE_API extern BOOL bDebug; -#else - #define bDebug 0 -#endif - -#define _RELEASE(x) { if(x) { (x)->Release(); (x)=NULL; } } -#define _SHOW_REF(msg, x) { if(x) { x->AddRef(); Log(msg,u32(x->Release()));}} - -// textures -ENGINE_API extern int psTextureLOD ; - -// psDeviceFlags -enum { - rsFullscreen = (1ul<<0ul), - rsClearBB = (1ul<<1ul), - rsVSync = (1ul<<2ul), - rsWireframe = (1ul<<3ul), - rsOcclusion = (1ul<<4ul), - rsStatistic = (1ul<<5ul), - rsDetails = (1ul<<6ul), - rsRefresh60hz = (1ul<<7ul), - rsConstantFPS = (1ul<<8ul), - rsDrawStatic = (1ul<<9ul), - rsDrawDynamic = (1ul<<10ul), - rsDisableObjectsAsCrows = (1ul<<11ul), - - rsOcclusionDraw = (1ul<<12ul), - rsOcclusionStats = (1ul<<13ul), - - mtSound = (1ul<<14ul), - mtPhysics = (1ul<<15ul), - mtNetwork = (1ul<<16ul), - mtParticles = (1ul<<17ul), - - rsCameraPos = (1ul<<18ul), - rsR2 = (1ul<<19ul), - - // 20-32 bit - reserved to Editor -}; - - -//. ENGINE_API extern u32 psCurrentMode ; -ENGINE_API extern u32 psCurrentVidMode[]; -ENGINE_API extern u32 psCurrentBPP ; -ENGINE_API extern Flags32 psDeviceFlags ; - -// game path definition -#define _game_data_ "$game_data$" -#define _game_textures_ "$game_textures$" -#define _game_levels_ "$game_levels$" -#define _game_sounds_ "$game_sounds$" -#define _game_meshes_ "$game_meshes$" -#define _game_shaders_ "$game_shaders$" -#define _game_config_ "$game_congif$" - -// editor path definition -#define _server_root_ "$server_root$" -#define _server_data_root_ "$server_data_root$" -#define _local_root_ "$local_root$" -#define _import_ "$import$" -#define _sounds_ "$sounds$" -#define _textures_ "$textures$" -#define _objects_ "$objects$" -#define _maps_ "$maps$" -#define _temp_ "$temp$" -#define _omotion_ "$omotion$" -#define _omotions_ "$omotions$" -#define _smotion_ "$smotion$" -#define _detail_objects_ "$detail_objects$" - -#endif diff --git a/src/utils/xrSE_Factory/xrSE_Factory.vcxproj b/src/utils/xrSE_Factory/xrSE_Factory.vcxproj index 96ceaf301e9..765a1c17bb7 100644 --- a/src/utils/xrSE_Factory/xrSE_Factory.vcxproj +++ b/src/utils/xrSE_Factory/xrSE_Factory.vcxproj @@ -310,7 +310,6 @@ - diff --git a/src/utils/xrSE_Factory/xrSE_Factory.vcxproj.filters b/src/utils/xrSE_Factory/xrSE_Factory.vcxproj.filters index a82c771eaf1..b58c23e1cfa 100644 --- a/src/utils/xrSE_Factory/xrSE_Factory.vcxproj.filters +++ b/src/utils/xrSE_Factory/xrSE_Factory.vcxproj.filters @@ -189,9 +189,6 @@ Common - - Common - Common\AComponents\SpaceRestrictionManager diff --git a/src/xrEngine/GameMtlLib.cpp b/src/xrEngine/GameMtlLib.cpp index 71d6f08932c..46ed6da00f8 100644 --- a/src/xrEngine/GameMtlLib.cpp +++ b/src/xrEngine/GameMtlLib.cpp @@ -3,7 +3,7 @@ #pragma hdrstop #include "GameMtlLib.h" -#include "Include/FSMacros.hpp" +#include "Common/FSMacros.hpp" CGameMtlLibrary GMLib; //CSound_manager_interface* Sound = NULL; diff --git a/src/xrEngine/defines.h b/src/xrEngine/defines.h index c0aa5df933c..8042542ce64 100644 --- a/src/xrEngine/defines.h +++ b/src/xrEngine/defines.h @@ -1,5 +1,4 @@ -#ifndef DefinesH -#define DefinesH +#pragma once #ifdef DEBUG ENGINE_API extern BOOL bDebug; @@ -7,9 +6,6 @@ ENGINE_API extern BOOL bDebug; #define bDebug 0 #endif -#define _RELEASE(x) { if(x) { (x)->Release(); (x)=NULL; } } -#define _SHOW_REF(msg, x) { if(x) { x->AddRef(); Log(msg,u32(x->Release()));}} - // textures ENGINE_API extern int psTextureLOD; @@ -50,6 +46,4 @@ ENGINE_API extern u32 psCurrentVidMode[]; ENGINE_API extern u32 psCurrentBPP; ENGINE_API extern Flags32 psDeviceFlags; -#include "Include/FSMacros.hpp" - -#endif +#include "Common/FSMacros.hpp" diff --git a/src/xrNetServer/stdafx.h b/src/xrNetServer/stdafx.h index 98b01009066..8edd8d4331e 100644 --- a/src/xrNetServer/stdafx.h +++ b/src/xrNetServer/stdafx.h @@ -18,7 +18,4 @@ #include "NET_Shared.h" -#define _RELEASE(x) { if(x) { (x)->Release(); (x)=NULL; } } -#define _SHOW_REF(msg, x) { if(x) { x->AddRef(); Log(msg,u32(x->Release()));}} - #endif //stdafxH diff --git a/src/xrServerEntities/xrServer_Objects_ALife.cpp b/src/xrServerEntities/xrServer_Objects_ALife.cpp index 7a54efd93bd..8aabbe602f6 100644 --- a/src/xrServerEntities/xrServer_Objects_ALife.cpp +++ b/src/xrServerEntities/xrServer_Objects_ALife.cpp @@ -21,7 +21,6 @@ #include "xrCore/Animation/Bone.hpp" #ifndef XRGAME_EXPORTS -# include "defines.h" LPCSTR GAME_CONFIG = "game.ltx"; #else // XRGAME_EXPORTS # include "xrEngine/render.h"