Remove securom stuff.

Author: nitrocaster

src/xrEngine/Device_Initialize.cpp

@@ -32,7 +32,7 @@ void CRenderDevice::initialize_editor()
 }
 #endif // #ifdef INGAME_EDITOR
 
-PROTECT_API void CRenderDevice::Initialize()
+void CRenderDevice::Initialize()
 {
     Log("Initializing Engine...");
     TimerGlobal.Start();

src/xrEngine/Device_create.cpp

@@ -3,7 +3,6 @@
 #include "Render.h"
 #include "dedicated_server_only.h"
 #include "xrCDB/xrXRC.h"
-#include "securom_api.h"
 
 extern XRCDB_API BOOL* cdb_bDebug;
 
@@ -20,9 +19,8 @@ void CRenderDevice::_SetupStates()
     GlobalEnv.Render->SetupStates();
 }
 
-PROTECT_API void CRenderDevice::Create()
+void CRenderDevice::Create()
 {
-    SECUROM_MARKER_SECURITY_ON(4);
     if (b_is_Ready)
         return; // prevent double call
     Statistic = xr_new<CStats>();
@@ -52,5 +50,4 @@ PROTECT_API void CRenderDevice::Create()
     Statistic->OnDeviceCreate();
     dwFrame = 0;
     PreCache(0, false, false);
-    SECUROM_MARKER_SECURITY_OFF(4);
 }

src/xrEngine/Engine.cpp

@@ -24,7 +24,7 @@ CEngine::~CEngine()
 
 extern void msCreate(LPCSTR name);
 
-PROTECT_API void CEngine::Initialize(void)
+void CEngine::Initialize(void)
 {
     Engine.Sheduler.Initialize();
 #ifdef DEBUG

src/xrEngine/EngineAPI.cpp

@@ -6,7 +6,6 @@
 #include "EngineAPI.h"
 #include "xrCDB/xrXRC.h"
 #include "xrScriptEngine/script_engine.hpp"
-#include "securom_api.h"
 
 extern xr_token* vid_quality_token;
 
@@ -48,23 +47,15 @@ ENGINE_API int g_current_renderer = 0;
 bool is_enough_address_space_available()
 {
     SYSTEM_INFO system_info;
-
-    SECUROM_MARKER_HIGH_SECURITY_ON(12)
-
-        GetSystemInfo(&system_info);
-
-    SECUROM_MARKER_HIGH_SECURITY_OFF(12)
-
-        return (*(u32*)&system_info.lpMaximumApplicationAddress) > 0x90000000;
+    GetSystemInfo(&system_info);
+    return (*(u32*)&system_info.lpMaximumApplicationAddress) > 0x90000000;
 }
 
 #ifndef DEDICATED_SERVER
 
 void CEngineAPI::InitializeNotDedicated()
 {
-    SECUROM_MARKER_HIGH_SECURITY_ON(2)
-
-        LPCSTR r2_name = "xrRender_R2.dll";
+    LPCSTR r2_name = "xrRender_R2.dll";
     LPCSTR r3_name = "xrRender_R3.dll";
     LPCSTR r4_name = "xrRender_R4.dll";
 
@@ -111,8 +102,6 @@ void CEngineAPI::InitializeNotDedicated()
         else
             g_current_renderer = 2;
     }
-
-    SECUROM_MARKER_HIGH_SECURITY_OFF(2)
 }
 #endif // DEDICATED_SERVER
 

src/xrEngine/Environment_misc.cpp

@@ -10,8 +10,6 @@
 #include "Common/object_broker.h"
 #include "xrServerEntities/LevelGameDef.h"
 
-#include "securom_api.h"
-
 void CEnvModifier::load(IReader* fs, u32 version)
 {
     use_flags.one();
@@ -537,9 +535,7 @@ void CEnvironment::mods_unload()
 
 void CEnvironment::load_level_specific_ambients()
 {
-    SECUROM_MARKER_PERFORMANCE_ON(13)
-
-        const shared_str level_name = g_pGameLevel->name();
+    const shared_str level_name = g_pGameLevel->name();
 
     string_path path;
     strconcat(sizeof(path), path, "environment\\ambients\\", level_name.c_str(), ".ltx");
@@ -571,8 +567,6 @@ void CEnvironment::load_level_specific_ambients()
     }
 
     xr_delete(level_ambients);
-
-    SECUROM_MARKER_PERFORMANCE_OFF(13)
 }
 
 CEnvDescriptor* CEnvironment::create_descriptor(shared_str const& identifier, CInifile* config)

src/xrEngine/IGame_Level.cpp

@@ -12,8 +12,6 @@
 #include "xr_object.h"
 #include "Feel_Sound.h"
 
-#include "securom_api.h"
-
 ENGINE_API IGame_Level* g_pGameLevel = NULL;
 extern BOOL g_bLoaded;
 
@@ -82,10 +80,8 @@ static void __stdcall build_callback(Fvector* V, int Vcnt, CDB::TRI* T, int Tcnt
 
 bool IGame_Level::Load(u32 dwNum)
 {
-    SECUROM_MARKER_PERFORMANCE_ON(10)
-
-        // Initialize level data
-        pApp->Level_Set(dwNum);
+    // Initialize level data
+    pApp->Level_Set(dwNum);
     string_path temp;
     if (!FS.exist(temp, "$level$", "level.ltx"))
         Debug.fatal(DEBUG_INFO, "Can't find level configuration file '%s'.", temp);
@@ -137,10 +133,7 @@ bool IGame_Level::Load(u32 dwNum)
 #endif
 
     Device.seqFrame.Add(this);
-
-    SECUROM_MARKER_PERFORMANCE_OFF(10)
-
-        return true;
+    return true;
 }
 
 #ifndef _EDITOR

src/xrEngine/XR_IOConsole.cpp

@@ -15,8 +15,6 @@
 
 #include "Include/xrRender/UIRender.h"
 
-#include "securom_api.h"
-
 static float const UI_BASE_WIDTH = 1024.0f;
 static float const UI_BASE_HEIGHT = 768.0f;
 static float const LDIST = 0.05f;
@@ -650,8 +648,6 @@ void CConsole::ExecuteCommand(LPCSTR cmd_str, bool record_cmd)
 
 void CConsole::Show()
 {
-    SECUROM_MARKER_HIGH_SECURITY_ON(11)
-
     if (bVisible)
     {
         return;
@@ -669,8 +665,6 @@ void CConsole::Show()
     m_editor->IR_Capture();
     Device.seqRender.Add(this, 1);
     Device.seqFrame.Add(this);
-
-    SECUROM_MARKER_HIGH_SECURITY_OFF(11)
 }
 
 extern CInput* pInput;

src/xrEngine/dedicated_server_only.h

@@ -5,15 +5,4 @@
 
 //#define DEDICATED_SERVER_ONLY
 
-#ifdef DEDICATED_SERVER_ONLY
-# define PROTECT_API
-#else// #ifdef DEDICATED_SERVER_ONLY
-# define PROTECT_API XR_EXPORT
-#endif // #ifdef DEDICATED_SERVER_ONLY
-
-#ifdef BENCHMARK_BUILD
-# undef PROTECT_API
-# define PROTECT_API
-#endif // #ifdef BENCHMARK_BUILD
-
 #endif // #ifndef DEDICATED_SERVER_ONLY_H_INCLUDED