From c5a58994b7fc5fd848b64d01900dc3c62cba8369 Mon Sep 17 00:00:00 2001 From: Xottab-DUTY Date: Mon, 28 May 2018 02:41:34 +0500 Subject: [PATCH] xrCore/ModuleLookup.cpp: rename methods according to the code style --- src/Layers/xrRender/HW.cpp | 4 +-- src/utils/xrAI/xrAI.cpp | 8 ++--- src/utils/xrLC/xrLC.cpp | 2 +- .../properties_list_helper_script.cpp | 4 +-- src/utils/xrSE_Factory/xrSE_Factory.cpp | 2 +- src/xrCore/ModuleLookup.cpp | 16 ++++----- src/xrCore/ModuleLookup.hpp | 8 ++--- src/xrEngine/Device_Initialize.cpp | 6 ++-- src/xrEngine/EngineAPI.cpp | 36 +++++++++---------- src/xrScriptEngine/script_engine.cpp | 6 ++-- 10 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/Layers/xrRender/HW.cpp b/src/Layers/xrRender/HW.cpp index f43ec72c499..2d55d5ba024 100644 --- a/src/Layers/xrRender/HW.cpp +++ b/src/Layers/xrRender/HW.cpp @@ -21,10 +21,10 @@ CHW::~CHW() {} void CHW::CreateD3D() { hD3D = XRay::LoadModule(GEnv.isDedicatedServer ? "xrD3D9-Null" : "d3d9.dll"); - R_ASSERT2(hD3D->exist(), "Can't find 'd3d9.dll'\nPlease install latest version of DirectX before running this program"); + R_ASSERT2(hD3D->IsLoaded(), "Can't find 'd3d9.dll'\nPlease install latest version of DirectX before running this program"); using _Direct3DCreate9 = IDirect3D9* WINAPI(UINT SDKVersion); - auto createD3D = (_Direct3DCreate9*)hD3D->getProcAddress("Direct3DCreate9"); + auto createD3D = (_Direct3DCreate9*)hD3D->GetProcAddress("Direct3DCreate9"); R_ASSERT(createD3D); pD3D = createD3D(D3D_SDK_VERSION); R_ASSERT2(pD3D, "Please install DirectX 9.0c"); diff --git a/src/utils/xrAI/xrAI.cpp b/src/utils/xrAI/xrAI.cpp index 4f410cb40b5..dcd874b65c9 100644 --- a/src/utils/xrAI/xrAI.cpp +++ b/src/utils/xrAI/xrAI.cpp @@ -104,7 +104,7 @@ void execute(LPSTR cmd) const auto hFactory = XRay::LoadModule("xrSE_Factory"); - R_ASSERT2(hFactory->exist(), "Factory DLL raised exception during loading or there is no factory DLL at all"); + R_ASSERT2(hFactory->IsLoaded(), "Factory DLL raised exception during loading or there is no factory DLL at all"); #ifdef XR_X64 pcstr create_entity_name = "create_entity"; @@ -113,15 +113,15 @@ void execute(LPSTR cmd) pcstr create_entity_name = "_create_entity@4"; pcstr destroy_entity_name = "_destroy_entity@4"; #endif - create_entity = (Factory_Create*)hFactory->getProcAddress(create_entity_name); - destroy_entity = (Factory_Destroy*)hFactory->getProcAddress(destroy_entity_name); + create_entity = (Factory_Create*)hFactory->GetProcAddress(create_entity_name); + destroy_entity = (Factory_Destroy*)hFactory->GetProcAddress(destroy_entity_name); R_ASSERT(create_entity); R_ASSERT(destroy_entity); CGameSpawnConstructor(name, output, start, !!no_separator_check); - hFactory->close(); + hFactory->Close(); create_entity = nullptr; destroy_entity = nullptr; diff --git a/src/utils/xrLC/xrLC.cpp b/src/utils/xrLC/xrLC.cpp index 9165f1dc5ed..e413bcb5e8e 100644 --- a/src/utils/xrLC/xrLC.cpp +++ b/src/utils/xrLC/xrLC.cpp @@ -95,7 +95,7 @@ void Startup(LPSTR lpCmdLine) Logger.Phase("Project options..."); const auto L = XRay::LoadModule("xrLC_Options"); - const auto O = (xrOptions*)L->getProcAddress("_frmScenePropertiesRun"); + const auto O = (xrOptions*)L->GetProcAddress("_frmScenePropertiesRun"); R_ASSERT(O); const int R = O(&Params, version, false); diff --git a/src/utils/xrSE_Factory/properties_list_helper_script.cpp b/src/utils/xrSE_Factory/properties_list_helper_script.cpp index 7fbfca86d46..77da038af8f 100644 --- a/src/utils/xrSE_Factory/properties_list_helper_script.cpp +++ b/src/utils/xrSE_Factory/properties_list_helper_script.cpp @@ -31,13 +31,13 @@ CScriptPropertiesListHelper* g_property_list_helper = nullptr; void load_prop_helper() { prop_helper_module = XRay::LoadModule(prop_helper_library); - if (!prop_helper_module->exist()) + if (!prop_helper_module->IsLoaded()) { Msg("! Cannot find library %s", prop_helper_library); return; } - _PHelper = (TPHelper)prop_helper_module->getProcAddress(prop_helper_func); + _PHelper = (TPHelper)prop_helper_module->GetProcAddress(prop_helper_func); if (!_PHelper) { Msg("! Cannot find entry point of the function %s in the library %s", prop_helper_func, prop_helper_func); diff --git a/src/utils/xrSE_Factory/xrSE_Factory.cpp b/src/utils/xrSE_Factory/xrSE_Factory.cpp index ab8c06a3fff..bda5fa73a60 100644 --- a/src/utils/xrSE_Factory/xrSE_Factory.cpp +++ b/src/utils/xrSE_Factory/xrSE_Factory.cpp @@ -63,7 +63,7 @@ BOOL APIENTRY DllMain(HANDLE module_handle, DWORD call_reason, LPVOID reserved) xr_delete(g_ai_space); xr_delete(g_object_factory); if (prop_helper_module) - prop_helper_module->close(); + prop_helper_module->Сlose(); //Core._destroy(); break; } diff --git a/src/xrCore/ModuleLookup.cpp b/src/xrCore/ModuleLookup.cpp index 2dcb6bffd70..28e26742e78 100644 --- a/src/xrCore/ModuleLookup.cpp +++ b/src/xrCore/ModuleLookup.cpp @@ -8,18 +8,18 @@ ModuleHandle::ModuleHandle(const bool dontUnload) : handle(nullptr), dontUnload( ModuleHandle::ModuleHandle(pcstr moduleName, bool dontUnload /*= false*/) : handle(nullptr), dontUnload(dontUnload) { - open(moduleName); + Open(moduleName); } ModuleHandle::~ModuleHandle() { - close(); + Сlose(); } -void* ModuleHandle::open(pcstr moduleName) +void* ModuleHandle::Open(pcstr moduleName) { - if (exist()) - close(); + if (IsLoaded()) + Сlose(); Log("Loading DLL:", moduleName); @@ -40,7 +40,7 @@ void* ModuleHandle::open(pcstr moduleName) return handle; } -void ModuleHandle::close() +void ModuleHandle::Сlose() { if (dontUnload) return; @@ -65,7 +65,7 @@ void ModuleHandle::close() handle = nullptr; } -bool ModuleHandle::exist() const +bool ModuleHandle::IsLoaded() const { return handle != nullptr; } @@ -75,7 +75,7 @@ void* ModuleHandle::operator()() const return handle; } -void* ModuleHandle::getProcAddress(pcstr procName) const +void* ModuleHandle::GetProcAddress(pcstr procName) const { void* proc = nullptr; diff --git a/src/xrCore/ModuleLookup.hpp b/src/xrCore/ModuleLookup.hpp index 9a0a38c4bf1..8263d689c8e 100644 --- a/src/xrCore/ModuleLookup.hpp +++ b/src/xrCore/ModuleLookup.hpp @@ -13,14 +13,14 @@ class XRCORE_API ModuleHandle ModuleHandle(pcstr moduleName, bool dontUnload = false); ~ModuleHandle(); - void* open(pcstr moduleName); - void close(); + void* Open(pcstr moduleName); + void Сlose(); - bool exist() const; + bool IsLoaded() const; void* operator()() const; - void* getProcAddress(pcstr procName) const; + void* GetProcAddress(pcstr procName) const; }; using Module = std::unique_ptr; diff --git a/src/xrEngine/Device_Initialize.cpp b/src/xrEngine/Device_Initialize.cpp index 8f753571128..8069cc73945 100644 --- a/src/xrEngine/Device_Initialize.cpp +++ b/src/xrEngine/Device_Initialize.cpp @@ -12,13 +12,13 @@ extern LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar void CRenderDevice::initialize_weather_editor() { m_editor_module = XRay::LoadModule("xrWeatherEditor"); - if (!m_editor_module->exist()) + if (!m_editor_module->IsLoaded()) return; - m_editor_initialize = (initialize_function_ptr)m_editor_module->getProcAddress("initialize"); + m_editor_initialize = (initialize_function_ptr)m_editor_module->GetProcAddress("initialize"); VERIFY(m_editor_initialize); - m_editor_finalize = (finalize_function_ptr)m_editor_module->getProcAddress("finalize"); + m_editor_finalize = (finalize_function_ptr)m_editor_module->GetProcAddress("finalize"); VERIFY(m_editor_finalize); m_engine = new engine_impl(); diff --git a/src/xrEngine/EngineAPI.cpp b/src/xrEngine/EngineAPI.cpp index 494dd8d4c4c..5ad009d96a4 100644 --- a/src/xrEngine/EngineAPI.cpp +++ b/src/xrEngine/EngineAPI.cpp @@ -51,7 +51,7 @@ void CEngineAPI::SetupCurrentRenderer() if (psDeviceFlags.test(rsRGL)) { - if (hRenderRGL->exist()) + if (hRenderRGL->IsLoaded()) { GEnv.CurrentRenderer = 5; GEnv.SetupCurrentRenderer = GEnv.SetupRGL; @@ -65,7 +65,7 @@ void CEngineAPI::SetupCurrentRenderer() if (psDeviceFlags.test(rsR4)) { - if (hRenderR4->exist()) + if (hRenderR4->IsLoaded()) { GEnv.CurrentRenderer = 4; GEnv.SetupCurrentRenderer = GEnv.SetupR4; @@ -79,7 +79,7 @@ void CEngineAPI::SetupCurrentRenderer() if (psDeviceFlags.test(rsR3)) { - if (hRenderR3->exist()) + if (hRenderR3->IsLoaded()) { GEnv.CurrentRenderer = 3; GEnv.SetupCurrentRenderer = GEnv.SetupR3; @@ -93,7 +93,7 @@ void CEngineAPI::SetupCurrentRenderer() if (psDeviceFlags.test(rsR2)) { - if (hRenderR2->exist()) + if (hRenderR2->IsLoaded()) { GEnv.CurrentRenderer = 2; GEnv.SetupCurrentRenderer = GEnv.SetupR2; @@ -107,7 +107,7 @@ void CEngineAPI::SetupCurrentRenderer() if (psDeviceFlags.test(rsR1)) { - if (hRenderR1->exist()) + if (hRenderR1->IsLoaded()) { GEnv.CurrentRenderer = 1; GEnv.SetupCurrentRenderer = GEnv.SetupR1; @@ -164,10 +164,10 @@ void CEngineAPI::Initialize(void) hGame = XRay::LoadModule("xrGame"); R_ASSERT2(hGame, "Game DLL raised exception during loading or there is no game DLL at all"); - pCreate = (Factory_Create*)hGame->getProcAddress("xrFactory_Create"); + pCreate = (Factory_Create*)hGame->GetProcAddress("xrFactory_Create"); R_ASSERT(pCreate); - pDestroy = (Factory_Destroy*)hGame->getProcAddress("xrFactory_Destroy"); + pDestroy = (Factory_Destroy*)hGame->GetProcAddress("xrFactory_Destroy"); R_ASSERT(pDestroy); ////////////////////////////////////////////////////////////////////////// @@ -176,8 +176,8 @@ void CEngineAPI::Initialize(void) if (strstr(Core.Params, "-tune")) { hTuner = XRay::LoadModule("vTuneAPI"); - tune_pause = (VTPause*)hTuner->getProcAddress("VTPause"); - tune_resume = (VTResume*)hTuner->getProcAddress("VTResume"); + tune_pause = (VTPause*)hTuner->GetProcAddress("VTPause"); + tune_resume = (VTResume*)hTuner->GetProcAddress("VTResume"); if (!tune_pause || !tune_resume) { @@ -213,7 +213,7 @@ void CEngineAPI::CreateRendererList() xr_vector modes; if (GEnv.isDedicatedServer) { - R_ASSERT2(hRenderR1->exist(), "Dedicated server needs xrRender_R1 to work"); + R_ASSERT2(hRenderR1->IsLoaded(), "Dedicated server needs xrRender_R1 to work"); modes.emplace_back(xr_token("renderer_r1", 0)); modes.emplace_back(xr_token(nullptr, -1)); vid_quality_token = std::move(modes); @@ -234,12 +234,12 @@ void CEngineAPI::CreateRendererList() // Restore error handling SetErrorMode(0); - if (hRenderR1->exist()) + if (hRenderR1->IsLoaded()) { modes.emplace_back(xr_token("renderer_r1", 0)); } - if (hRenderR2->exist()) + if (hRenderR2->IsLoaded()) { modes.emplace_back(xr_token("renderer_r2a", 1)); modes.emplace_back(xr_token("renderer_r2", 2)); @@ -247,28 +247,28 @@ void CEngineAPI::CreateRendererList() modes.emplace_back(xr_token("renderer_r2.5", 3)); } - if (hRenderR3->exist()) + if (hRenderR3->IsLoaded()) { if (GEnv.CheckR3 && GEnv.CheckR3()) modes.emplace_back(xr_token("renderer_r3", 4)); else - hRenderR3->close(); + hRenderR3->Сlose(); } - if (hRenderR4->exist()) + if (hRenderR4->IsLoaded()) { if (GEnv.CheckR4 && GEnv.CheckR4()) modes.emplace_back(xr_token("renderer_r4", 5)); else - hRenderR4->close(); + hRenderR4->Сlose(); } - if (hRenderRGL->exist()) + if (hRenderRGL->IsLoaded()) { if (GEnv.CheckRGL && GEnv.CheckRGL()) modes.emplace_back(xr_token("renderer_gl", 6)); else - hRenderRGL->close(); + hRenderRGL->Сlose(); } modes.emplace_back(xr_token(nullptr, -1)); diff --git a/src/xrScriptEngine/script_engine.cpp b/src/xrScriptEngine/script_engine.cpp index c1d535783ab..62fc2b8682f 100644 --- a/src/xrScriptEngine/script_engine.cpp +++ b/src/xrScriptEngine/script_engine.cpp @@ -745,18 +745,18 @@ void CScriptEngine::initialize_lua_studio(lua_State* state, cs::lua_studio::worl const auto s_script_debugger_module = XRay::LoadModule(CS_LUA_STUDIO_BACKEND_FILE_NAME); SetErrorMode(old_error_mode); - if (!s_script_debugger_module->exist()) + if (!s_script_debugger_module->IsLoaded()) { Msg("! cannot load %s dynamic library", CS_LUA_STUDIO_BACKEND_FILE_NAME); return; } s_create_world = - (create_world_function_type)s_script_debugger_module->getProcAddress("_cs_lua_studio_backend_create_world@12"); + (create_world_function_type)s_script_debugger_module->GetProcAddress("_cs_lua_studio_backend_create_world@12"); R_ASSERT2(s_create_world, "can't find function \"cs_lua_studio_backend_create_world\""); s_destroy_world = - (destroy_world_function_type)s_script_debugger_module->getProcAddress("_cs_lua_studio_backend_destroy_world@4"); + (destroy_world_function_type)s_script_debugger_module->GetProcAddress("_cs_lua_studio_backend_destroy_world@4"); R_ASSERT2(s_destroy_world, "can't find function \"cs_lua_studio_backend_destroy_world\" in the library"); engine = new lua_studio_engine();