Skip to content

Commit 3efd515

Browse files
committed
Common: fix some comment and printed messages
1 parent 6b75817 commit 3efd515

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

src/Layers/xrRender/ResourceManager_Loader.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,16 @@ void CResourceManager::OnDeviceCreate(IReader* F)
9696
{
9797
CBlender_DESC desc;
9898
chunk->r(&desc, sizeof(desc));
99+
#ifdef LINUX
100+
while (char* sep = strchr(desc.cName, '\\')) *sep = '/';
101+
#endif
99102
IBlender* B = IBlender::Create(desc.CLS);
100103
if (nullptr == B)
101104
{
102105
Msg("! Renderer doesn't support blender '%s'", desc.cName);
103106
}
104107
else
105108
{
106-
#ifdef LINUX
107-
while (char* sep = strchr(desc.cName, '\\')) *sep = '/';
108-
#endif
109109
if (B->getDescription().version != desc.version)
110110
{
111111
Msg("! Version conflict in shader '%s'", desc.cName);

src/xrEngine/Device_destroy.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ void CRenderDevice::Destroy()
1919
{
2020
if (!b_is_Ready)
2121
return;
22-
Log("Destroying Direct3D...");
22+
Log("Destroying Render...");
2323
GEnv.Render->ValidateHW();
2424
GEnv.DU->OnDeviceDestroy();
2525
b_is_Ready = false;

src/xrGame/GameObject.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ void CGameObject::MakeMeCrow()
112112
return;
113113
u32 const device_frame_id = Device.dwFrame;
114114
u32 const object_frame_id = dwFrame_AsCrow;
115-
#ifndef LINUX // FIXME!!!
115+
#ifndef LINUX
116116
if ((u32)_InterlockedCompareExchange((long*)&dwFrame_AsCrow, device_frame_id, object_frame_id) == device_frame_id)
117117
#else
118118
if (__sync_val_compare_and_swap((long*)&dwFrame_AsCrow, object_frame_id, device_frame_id) == device_frame_id)

src/xrGame/console_commands.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,11 @@ static void full_memory_stats()
156156
size_t _process_heap = ::Memory.mem_usage();
157157
int _eco_strings = (int)g_pStringContainer->stat_economy();
158158
int _eco_smem = (int)g_pSharedMemoryContainer->stat_economy();
159-
Msg("* [ D3D ]: textures[%d K]", (m_base + m_lmaps) / 1024);
160-
Msg("* [x-ray]: process heap[%u K]", _process_heap / 1024);
161-
Msg("* [x-ray]: economy: strings[%d K], smem[%d K]", _eco_strings / 1024, _eco_smem);
159+
Msg("* [ Render ]: textures[%d K]", (m_base + m_lmaps) / 1024);
160+
Msg("* [ x-ray ]: process heap[%u K]", _process_heap / 1024);
161+
Msg("* [ x-ray ]: economy: strings[%d K], smem[%d K]", _eco_strings / 1024, _eco_smem);
162162
#ifdef FS_DEBUG
163-
Msg("* [x-ray]: file mapping: memory[%d K], count[%d]", g_file_mapped_memory / 1024, g_file_mapped_count);
163+
Msg("* [ x-ray ]: file mapping: memory[%d K], count[%d]", g_file_mapped_memory / 1024, g_file_mapped_count);
164164
dump_file_mappings();
165165
#endif
166166
}

src/xrGame/xrServer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ void xrServer::Server_Client_Check(IClient* CL)
829829
{
830830
return;
831831
};
832-
#ifdef LINUX // FIXME!!!
832+
#ifdef LINUX
833833
if (CL->process_id == getpid())
834834
#else
835835
if (CL->process_id == GetCurrentProcessId())

0 commit comments

Comments
 (0)