Common: fix some comment and printed messages

OpenXRay · Nov 6, 2018 · 3efd515 · 3efd515
1 parent 6b75817
commit 3efd515
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/src/Layers/xrRender/ResourceManager_Loader.cpp b/src/Layers/xrRender/ResourceManager_Loader.cpp
@@ -96,16 +96,16 @@ void CResourceManager::OnDeviceCreate(IReader* F)
         {
             CBlender_DESC desc;
             chunk->r(&desc, sizeof(desc));
+#ifdef LINUX
+            while (char* sep = strchr(desc.cName, '\\')) *sep = '/';
+#endif
             IBlender* B = IBlender::Create(desc.CLS);
             if (nullptr == B)
             {
                 Msg("! Renderer doesn't support blender '%s'", desc.cName);
             }
             else
             {
-#ifdef LINUX
-                while (char* sep = strchr(desc.cName, '\\')) *sep = '/';
-#endif
                 if (B->getDescription().version != desc.version)
                 {
                     Msg("! Version conflict in shader '%s'", desc.cName);

diff --git a/src/xrEngine/Device_destroy.cpp b/src/xrEngine/Device_destroy.cpp
@@ -19,7 +19,7 @@ void CRenderDevice::Destroy()
 {
     if (!b_is_Ready)
         return;
-    Log("Destroying Direct3D...");
+    Log("Destroying Render...");
     GEnv.Render->ValidateHW();
     GEnv.DU->OnDeviceDestroy();
     b_is_Ready = false;

diff --git a/src/xrGame/GameObject.cpp b/src/xrGame/GameObject.cpp
@@ -112,7 +112,7 @@ void CGameObject::MakeMeCrow()
         return;
     u32 const device_frame_id = Device.dwFrame;
     u32 const object_frame_id = dwFrame_AsCrow;
-#ifndef LINUX // FIXME!!!
+#ifndef LINUX
     if ((u32)_InterlockedCompareExchange((long*)&dwFrame_AsCrow, device_frame_id, object_frame_id) == device_frame_id)
 #else
      if (__sync_val_compare_and_swap((long*)&dwFrame_AsCrow, object_frame_id, device_frame_id) == device_frame_id)

diff --git a/src/xrGame/console_commands.cpp b/src/xrGame/console_commands.cpp
@@ -156,11 +156,11 @@ static void full_memory_stats()
     size_t _process_heap = ::Memory.mem_usage();
     int _eco_strings = (int)g_pStringContainer->stat_economy();
     int _eco_smem = (int)g_pSharedMemoryContainer->stat_economy();
-    Msg("* [ D3D ]: textures[%d K]", (m_base + m_lmaps) / 1024);
-    Msg("* [x-ray]: process heap[%u K]", _process_heap / 1024);
-    Msg("* [x-ray]: economy: strings[%d K], smem[%d K]", _eco_strings / 1024, _eco_smem);
+    Msg("* [ Render ]: textures[%d K]", (m_base + m_lmaps) / 1024);
+    Msg("* [ x-ray  ]: process heap[%u K]", _process_heap / 1024);
+    Msg("* [ x-ray  ]: economy: strings[%d K], smem[%d K]", _eco_strings / 1024, _eco_smem);
 #ifdef FS_DEBUG
-    Msg("* [x-ray]: file mapping: memory[%d K], count[%d]", g_file_mapped_memory / 1024, g_file_mapped_count);
+    Msg("* [ x-ray  ]: file mapping: memory[%d K], count[%d]", g_file_mapped_memory / 1024, g_file_mapped_count);
     dump_file_mappings();
 #endif
 }

diff --git a/src/xrGame/xrServer.cpp b/src/xrGame/xrServer.cpp
@@ -829,7 +829,7 @@ void xrServer::Server_Client_Check(IClient* CL)
     {
         return;
     };
-#ifdef LINUX // FIXME!!!
+#ifdef LINUX
     if (CL->process_id == getpid())
 #else
     if (CL->process_id == GetCurrentProcessId())