Layers/xrRender/dxDebugRender.cpp: remove unused DebugRenderImpl_1

xrEngine/IGame_Level.cpp: fix sleepless dedicated server xrEngine/EngineAPI.cpp: fix copypaste xrEngine/xr_object_list.cpp: add forgotten &
OpenXRay · Apr 4, 2018 · 575d30f · 575d30f
1 parent 992096c
commit 575d30f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/src/Layers/xrRender/dxDebugRender.cpp b/src/Layers/xrRender/dxDebugRender.cpp
@@ -6,7 +6,6 @@
 #include "dxUIShader.h"
 
 dxDebugRender DebugRenderImpl;
-dxDebugRender DebugRenderImpl_1;
 dxDebugRender::dxDebugRender()
 {
     m_line_indices.reserve(line_vertex_limit);
@@ -133,8 +132,6 @@ struct RDebugRender : public dxDebugRender, public pureRender
     xr_vector<u16> _line_indices;
     xr_vector<FVF::L> _line_vertices;
 
-    //	Vertices		_line_vertices;
-    //	Indices			_line_indices;
 public:
     RDebugRender()
     {

diff --git a/src/xrEngine/EngineAPI.cpp b/src/xrEngine/EngineAPI.cpp
@@ -179,7 +179,7 @@ void CEngineAPI::Initialize(void)
         tune_pause = (VTPause*)hTuner->getProcAddress("VTPause");
         tune_resume = (VTResume*)hTuner->getProcAddress("VTResume");
 
-        if (!tune_pause || !tune_pause)
+        if (!tune_pause || !tune_resume)
         {
             Log("Can't initialize Intel vTune");
             tune_pause = dummy;

diff --git a/src/xrEngine/IGame_Level.cpp b/src/xrEngine/IGame_Level.cpp
@@ -140,7 +140,10 @@ int psNET_DedicatedSleep = 5;
 void IGame_Level::OnRender()
 {
     if (GEnv.isDedicatedServer)
+    {
+        Sleep(psNET_DedicatedSleep);
         return;
+    }
 
     // if (_abs(Device.fTimeDelta)<EPS_S) return;
 
@@ -153,15 +156,8 @@ void IGame_Level::OnRender()
 #endif // _GPA_ENABLED
 
     // Level render, only when no client output required
-    if (!GEnv.isDedicatedServer)
-    {
-        GEnv.Render->Calculate();
-        GEnv.Render->Render();
-    }
-    else
-    {
-        Sleep(psNET_DedicatedSleep);
-    }
+    GEnv.Render->Calculate();
+    GEnv.Render->Render();
 
 #ifdef _GPA_ENABLED
     TAL_RetireID(rtID);

diff --git a/src/xrEngine/xr_object_list.cpp b/src/xrEngine/xr_object_list.cpp
@@ -54,7 +54,7 @@ CObjectList::~CObjectList()
 
 IGameObject* CObjectList::FindObjectByName(shared_str name)
 {
-    for (auto it : objects_active)
+    for (auto& it : objects_active)
         if (it->cName().equal(name))
             return it;