Skip to content

Commit c5a5899

Browse files
Xottab-DUTYXottab-DUTY
committed
xrCore/ModuleLookup.cpp: rename methods according to the code style
1 parent 65559cd commit c5a5899

File tree

10 files changed

+46
-46
lines changed

10 files changed

+46
-46
lines changed

‎src/Layers/xrRender/HW.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ CHW::~CHW() {}
2121
void CHW::CreateD3D()
2222
{
2323
hD3D = XRay::LoadModule(GEnv.isDedicatedServer ? "xrD3D9-Null" : "d3d9.dll");
24-
R_ASSERT2(hD3D->exist(), "Can't find 'd3d9.dll'\nPlease install latest version of DirectX before running this program");
24+
R_ASSERT2(hD3D->IsLoaded(), "Can't find 'd3d9.dll'\nPlease install latest version of DirectX before running this program");
2525

2626
using _Direct3DCreate9 = IDirect3D9* WINAPI(UINT SDKVersion);
27-
auto createD3D = (_Direct3DCreate9*)hD3D->getProcAddress("Direct3DCreate9");
27+
auto createD3D = (_Direct3DCreate9*)hD3D->GetProcAddress("Direct3DCreate9");
2828
R_ASSERT(createD3D);
2929
pD3D = createD3D(D3D_SDK_VERSION);
3030
R_ASSERT2(pD3D, "Please install DirectX 9.0c");

‎src/utils/xrAI/xrAI.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ void execute(LPSTR cmd)
104104

105105
const auto hFactory = XRay::LoadModule("xrSE_Factory");
106106

107-
R_ASSERT2(hFactory->exist(), "Factory DLL raised exception during loading or there is no factory DLL at all");
107+
R_ASSERT2(hFactory->IsLoaded(), "Factory DLL raised exception during loading or there is no factory DLL at all");
108108

109109
#ifdef XR_X64
110110
pcstr create_entity_name = "create_entity";
@@ -113,15 +113,15 @@ void execute(LPSTR cmd)
113113
pcstr create_entity_name = "_create_entity@4";
114114
pcstr destroy_entity_name = "_destroy_entity@4";
115115
#endif
116-
create_entity = (Factory_Create*)hFactory->getProcAddress(create_entity_name);
117-
destroy_entity = (Factory_Destroy*)hFactory->getProcAddress(destroy_entity_name);
116+
create_entity = (Factory_Create*)hFactory->GetProcAddress(create_entity_name);
117+
destroy_entity = (Factory_Destroy*)hFactory->GetProcAddress(destroy_entity_name);
118118

119119
R_ASSERT(create_entity);
120120
R_ASSERT(destroy_entity);
121121

122122
CGameSpawnConstructor(name, output, start, !!no_separator_check);
123123

124-
hFactory->close();
124+
hFactory->Close();
125125

126126
create_entity = nullptr;
127127
destroy_entity = nullptr;

‎src/utils/xrLC/xrLC.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ void Startup(LPSTR lpCmdLine)
9595
Logger.Phase("Project options...");
9696
const auto L = XRay::LoadModule("xrLC_Options");
9797

98-
const auto O = (xrOptions*)L->getProcAddress("_frmScenePropertiesRun");
98+
const auto O = (xrOptions*)L->GetProcAddress("_frmScenePropertiesRun");
9999
R_ASSERT(O);
100100

101101
const int R = O(&Params, version, false);

‎src/utils/xrSE_Factory/properties_list_helper_script.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ CScriptPropertiesListHelper* g_property_list_helper = nullptr;
3131
void load_prop_helper()
3232
{
3333
prop_helper_module = XRay::LoadModule(prop_helper_library);
34-
if (!prop_helper_module->exist())
34+
if (!prop_helper_module->IsLoaded())
3535
{
3636
Msg("! Cannot find library %s", prop_helper_library);
3737
return;
3838
}
3939

40-
_PHelper = (TPHelper)prop_helper_module->getProcAddress(prop_helper_func);
40+
_PHelper = (TPHelper)prop_helper_module->GetProcAddress(prop_helper_func);
4141
if (!_PHelper)
4242
{
4343
Msg("! Cannot find entry point of the function %s in the library %s", prop_helper_func, prop_helper_func);

‎src/utils/xrSE_Factory/xrSE_Factory.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ BOOL APIENTRY DllMain(HANDLE module_handle, DWORD call_reason, LPVOID reserved)
6363
xr_delete(g_ai_space);
6464
xr_delete(g_object_factory);
6565
if (prop_helper_module)
66-
prop_helper_module->close();
66+
prop_helper_module->Сlose();
6767
//Core._destroy();
6868
break;
6969
}

‎src/xrCore/ModuleLookup.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ ModuleHandle::ModuleHandle(const bool dontUnload) : handle(nullptr), dontUnload(
88

99
ModuleHandle::ModuleHandle(pcstr moduleName, bool dontUnload /*= false*/) : handle(nullptr), dontUnload(dontUnload)
1010
{
11-
open(moduleName);
11+
Open(moduleName);
1212
}
1313

1414
ModuleHandle::~ModuleHandle()
1515
{
16-
close();
16+
Сlose();
1717
}
1818

19-
void* ModuleHandle::open(pcstr moduleName)
19+
void* ModuleHandle::Open(pcstr moduleName)
2020
{
21-
if (exist())
22-
close();
21+
if (IsLoaded())
22+
Сlose();
2323

2424
Log("Loading DLL:", moduleName);
2525

@@ -40,7 +40,7 @@ void* ModuleHandle::open(pcstr moduleName)
4040
return handle;
4141
}
4242

43-
void ModuleHandle::close()
43+
void ModuleHandle::Сlose()
4444
{
4545
if (dontUnload)
4646
return;
@@ -65,7 +65,7 @@ void ModuleHandle::close()
6565
handle = nullptr;
6666
}
6767

68-
bool ModuleHandle::exist() const
68+
bool ModuleHandle::IsLoaded() const
6969
{
7070
return handle != nullptr;
7171
}
@@ -75,7 +75,7 @@ void* ModuleHandle::operator()() const
7575
return handle;
7676
}
7777

78-
void* ModuleHandle::getProcAddress(pcstr procName) const
78+
void* ModuleHandle::GetProcAddress(pcstr procName) const
7979
{
8080
void* proc = nullptr;
8181

‎src/xrCore/ModuleLookup.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ class XRCORE_API ModuleHandle
1313
ModuleHandle(pcstr moduleName, bool dontUnload = false);
1414
~ModuleHandle();
1515

16-
void* open(pcstr moduleName);
17-
void close();
16+
void* Open(pcstr moduleName);
17+
void Сlose();
1818

19-
bool exist() const;
19+
bool IsLoaded() const;
2020

2121
void* operator()() const;
2222

23-
void* getProcAddress(pcstr procName) const;
23+
void* GetProcAddress(pcstr procName) const;
2424
};
2525

2626
using Module = std::unique_ptr<ModuleHandle>;

‎src/xrEngine/Device_Initialize.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ extern LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
1212
void CRenderDevice::initialize_weather_editor()
1313
{
1414
m_editor_module = XRay::LoadModule("xrWeatherEditor");
15-
if (!m_editor_module->exist())
15+
if (!m_editor_module->IsLoaded())
1616
return;
1717

18-
m_editor_initialize = (initialize_function_ptr)m_editor_module->getProcAddress("initialize");
18+
m_editor_initialize = (initialize_function_ptr)m_editor_module->GetProcAddress("initialize");
1919
VERIFY(m_editor_initialize);
2020

21-
m_editor_finalize = (finalize_function_ptr)m_editor_module->getProcAddress("finalize");
21+
m_editor_finalize = (finalize_function_ptr)m_editor_module->GetProcAddress("finalize");
2222
VERIFY(m_editor_finalize);
2323

2424
m_engine = new engine_impl();

‎src/xrEngine/EngineAPI.cpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void CEngineAPI::SetupCurrentRenderer()
5151

5252
if (psDeviceFlags.test(rsRGL))
5353
{
54-
if (hRenderRGL->exist())
54+
if (hRenderRGL->IsLoaded())
5555
{
5656
GEnv.CurrentRenderer = 5;
5757
GEnv.SetupCurrentRenderer = GEnv.SetupRGL;
@@ -65,7 +65,7 @@ void CEngineAPI::SetupCurrentRenderer()
6565

6666
if (psDeviceFlags.test(rsR4))
6767
{
68-
if (hRenderR4->exist())
68+
if (hRenderR4->IsLoaded())
6969
{
7070
GEnv.CurrentRenderer = 4;
7171
GEnv.SetupCurrentRenderer = GEnv.SetupR4;
@@ -79,7 +79,7 @@ void CEngineAPI::SetupCurrentRenderer()
7979

8080
if (psDeviceFlags.test(rsR3))
8181
{
82-
if (hRenderR3->exist())
82+
if (hRenderR3->IsLoaded())
8383
{
8484
GEnv.CurrentRenderer = 3;
8585
GEnv.SetupCurrentRenderer = GEnv.SetupR3;
@@ -93,7 +93,7 @@ void CEngineAPI::SetupCurrentRenderer()
9393

9494
if (psDeviceFlags.test(rsR2))
9595
{
96-
if (hRenderR2->exist())
96+
if (hRenderR2->IsLoaded())
9797
{
9898
GEnv.CurrentRenderer = 2;
9999
GEnv.SetupCurrentRenderer = GEnv.SetupR2;
@@ -107,7 +107,7 @@ void CEngineAPI::SetupCurrentRenderer()
107107

108108
if (psDeviceFlags.test(rsR1))
109109
{
110-
if (hRenderR1->exist())
110+
if (hRenderR1->IsLoaded())
111111
{
112112
GEnv.CurrentRenderer = 1;
113113
GEnv.SetupCurrentRenderer = GEnv.SetupR1;
@@ -164,10 +164,10 @@ void CEngineAPI::Initialize(void)
164164
hGame = XRay::LoadModule("xrGame");
165165
R_ASSERT2(hGame, "Game DLL raised exception during loading or there is no game DLL at all");
166166

167-
pCreate = (Factory_Create*)hGame->getProcAddress("xrFactory_Create");
167+
pCreate = (Factory_Create*)hGame->GetProcAddress("xrFactory_Create");
168168
R_ASSERT(pCreate);
169169

170-
pDestroy = (Factory_Destroy*)hGame->getProcAddress("xrFactory_Destroy");
170+
pDestroy = (Factory_Destroy*)hGame->GetProcAddress("xrFactory_Destroy");
171171
R_ASSERT(pDestroy);
172172

173173
//////////////////////////////////////////////////////////////////////////
@@ -176,8 +176,8 @@ void CEngineAPI::Initialize(void)
176176
if (strstr(Core.Params, "-tune"))
177177
{
178178
hTuner = XRay::LoadModule("vTuneAPI");
179-
tune_pause = (VTPause*)hTuner->getProcAddress("VTPause");
180-
tune_resume = (VTResume*)hTuner->getProcAddress("VTResume");
179+
tune_pause = (VTPause*)hTuner->GetProcAddress("VTPause");
180+
tune_resume = (VTResume*)hTuner->GetProcAddress("VTResume");
181181

182182
if (!tune_pause || !tune_resume)
183183
{
@@ -213,7 +213,7 @@ void CEngineAPI::CreateRendererList()
213213
xr_vector<xr_token> modes;
214214
if (GEnv.isDedicatedServer)
215215
{
216-
R_ASSERT2(hRenderR1->exist(), "Dedicated server needs xrRender_R1 to work");
216+
R_ASSERT2(hRenderR1->IsLoaded(), "Dedicated server needs xrRender_R1 to work");
217217
modes.emplace_back(xr_token("renderer_r1", 0));
218218
modes.emplace_back(xr_token(nullptr, -1));
219219
vid_quality_token = std::move(modes);
@@ -234,41 +234,41 @@ void CEngineAPI::CreateRendererList()
234234
// Restore error handling
235235
SetErrorMode(0);
236236

237-
if (hRenderR1->exist())
237+
if (hRenderR1->IsLoaded())
238238
{
239239
modes.emplace_back(xr_token("renderer_r1", 0));
240240
}
241241

242-
if (hRenderR2->exist())
242+
if (hRenderR2->IsLoaded())
243243
{
244244
modes.emplace_back(xr_token("renderer_r2a", 1));
245245
modes.emplace_back(xr_token("renderer_r2", 2));
246246
if (GEnv.CheckR2 && GEnv.CheckR2())
247247
modes.emplace_back(xr_token("renderer_r2.5", 3));
248248
}
249249

250-
if (hRenderR3->exist())
250+
if (hRenderR3->IsLoaded())
251251
{
252252
if (GEnv.CheckR3 && GEnv.CheckR3())
253253
modes.emplace_back(xr_token("renderer_r3", 4));
254254
else
255-
hRenderR3->close();
255+
hRenderR3->Сlose();
256256
}
257257

258-
if (hRenderR4->exist())
258+
if (hRenderR4->IsLoaded())
259259
{
260260
if (GEnv.CheckR4 && GEnv.CheckR4())
261261
modes.emplace_back(xr_token("renderer_r4", 5));
262262
else
263-
hRenderR4->close();
263+
hRenderR4->Сlose();
264264
}
265265

266-
if (hRenderRGL->exist())
266+
if (hRenderRGL->IsLoaded())
267267
{
268268
if (GEnv.CheckRGL && GEnv.CheckRGL())
269269
modes.emplace_back(xr_token("renderer_gl", 6));
270270
else
271-
hRenderRGL->close();
271+
hRenderRGL->Сlose();
272272
}
273273
modes.emplace_back(xr_token(nullptr, -1));
274274

‎src/xrScriptEngine/script_engine.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -745,18 +745,18 @@ void CScriptEngine::initialize_lua_studio(lua_State* state, cs::lua_studio::worl
745745

746746
const auto s_script_debugger_module = XRay::LoadModule(CS_LUA_STUDIO_BACKEND_FILE_NAME);
747747
SetErrorMode(old_error_mode);
748-
if (!s_script_debugger_module->exist())
748+
if (!s_script_debugger_module->IsLoaded())
749749
{
750750
Msg("! cannot load %s dynamic library", CS_LUA_STUDIO_BACKEND_FILE_NAME);
751751
return;
752752
}
753753

754754
s_create_world =
755-
(create_world_function_type)s_script_debugger_module->getProcAddress("_cs_lua_studio_backend_create_world@12");
755+
(create_world_function_type)s_script_debugger_module->GetProcAddress("_cs_lua_studio_backend_create_world@12");
756756
R_ASSERT2(s_create_world, "can't find function \"cs_lua_studio_backend_create_world\"");
757757

758758
s_destroy_world =
759-
(destroy_world_function_type)s_script_debugger_module->getProcAddress("_cs_lua_studio_backend_destroy_world@4");
759+
(destroy_world_function_type)s_script_debugger_module->GetProcAddress("_cs_lua_studio_backend_destroy_world@4");
760760
R_ASSERT2(s_destroy_world, "can't find function \"cs_lua_studio_backend_destroy_world\" in the library");
761761

762762
engine = new lua_studio_engine();

0 commit comments

Comments
 (0)