xrCore/ModuleLookup.cpp: replace Russian С with English C

Probably, you should sleep at night or you will create commits and 3x more commits to fix previous commits like me 👍
OpenXRay · May 28, 2018 · 9bfcd4b · 9bfcd4b
1 parent 62858d0
commit 9bfcd4b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/src/utils/xrAI/xrAI.cpp b/src/utils/xrAI/xrAI.cpp
@@ -121,8 +121,6 @@ void execute(LPSTR cmd)
 
             CGameSpawnConstructor(name, output, start, !!no_separator_check);
 
-            hFactory->Close();
-
             create_entity = nullptr;
             destroy_entity = nullptr;
         }

diff --git 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->Сlose();
+            prop_helper_module = nullptr;
         //Core._destroy();
         break;
     }

diff --git a/src/xrCore/ModuleLookup.cpp b/src/xrCore/ModuleLookup.cpp
@@ -13,13 +13,13 @@ ModuleHandle::ModuleHandle(pcstr moduleName, bool dontUnload /*= false*/) : hand
 
 ModuleHandle::~ModuleHandle()
 {
-    Сlose();
+    Close();
 }
 
 void* ModuleHandle::Open(pcstr moduleName)
 {
     if (IsLoaded())
-        Сlose();
+        Close();
 
     Log("Loading DLL:", moduleName);
 
@@ -40,7 +40,7 @@ void* ModuleHandle::Open(pcstr moduleName)
     return handle;
 }
 
-void ModuleHandle::Сlose()
+void ModuleHandle::Close()
 {
     if (dontUnload)
         return;
@@ -49,7 +49,7 @@ void ModuleHandle::Сlose()
 
 #ifdef WINDOWS
     closed = FreeLibrary(static_cast<HMODULE>(handle)) != 0;
-defined(LINUX)
+#elif defined(LINUX)
     closed = dlclose(handle) == 0;
 #endif
 

diff --git a/src/xrCore/ModuleLookup.hpp b/src/xrCore/ModuleLookup.hpp
@@ -14,7 +14,7 @@ class XRCORE_API ModuleHandle
     ~ModuleHandle();
 
     void* Open(pcstr moduleName);
-    void Сlose();
+    void Close();
 
     bool IsLoaded() const;
 

diff --git a/src/xrEngine/EngineAPI.cpp b/src/xrEngine/EngineAPI.cpp
@@ -252,23 +252,23 @@ void CEngineAPI::CreateRendererList()
         if (GEnv.CheckR3 && GEnv.CheckR3())
             modes.emplace_back(xr_token("renderer_r3", 4));
         else
-            hRenderR3->Сlose();
+            hRenderR3->Close();
     }
 
     if (hRenderR4->IsLoaded())
     {
         if (GEnv.CheckR4 && GEnv.CheckR4())
             modes.emplace_back(xr_token("renderer_r4", 5));
         else
-            hRenderR4->Сlose();
+            hRenderR4->Close();
     }
 
     if (hRenderRGL->IsLoaded())
     {
         if (GEnv.CheckRGL && GEnv.CheckRGL())
             modes.emplace_back(xr_token("renderer_gl", 6));
         else
-            hRenderRGL->Сlose();
+            hRenderRGL->Close();
     }
     modes.emplace_back(xr_token(nullptr, -1));