Fixed missing frame graph when FPS is unlimited. Moved frame graph labels.

Author: ccw808

Client/core/CCore.cpp

@@ -1801,15 +1801,15 @@ void CCore::ApplyFrameRateLimit(uint uiOverrideRate)
 
     uint uiUseRate = uiOverrideRate != -1 ? uiOverrideRate : m_uiFrameRateLimit;
 
-    if (uiUseRate < 1)
-        return DoReliablePulse();
-
-    // Apply previous frame rate if is hasn't been done yet
-    ApplyQueuedFrameRateLimit();
+    if (uiUseRate > 0)
+    {
+        // Apply previous frame rate if is hasn't been done yet
+        ApplyQueuedFrameRateLimit();
 
-    // Limit is usually applied in OnGameTimerUpdate
-    m_uiQueuedFrameRate = uiUseRate;
-    m_bQueuedFrameRateValid = true;
+        // Limit is usually applied in OnGameTimerUpdate
+        m_uiQueuedFrameRate = uiUseRate;
+        m_bQueuedFrameRateValid = true;
+    }
 
     DoReliablePulse();
 

Client/core/CGraphStats.cpp

@@ -207,12 +207,14 @@ void CGraphStats::Draw(void)
     uint  uiSizeY = 150;
     uint  uiRangeY = 100;            // 100ms
     float fLineScale = 1 / 1000.f / uiRangeY * uiSizeY;
-    float fHalfLineHeight = pGraphics->GetDXFontHeight() / 2;
+    float fLineHeight = pGraphics->GetDXFontHeight();
 
     // Backgroung box
     pGraphics->DrawRectQueued(uiOriginX, uiOriginY - uiSizeY, uiSizeX, uiSizeY, SColorRGBA(0, 0, 0, 128), true);
 
-    // Draw data line.
+    // Draw data lines
+    float fLabelX = uiOriginX + uiSizeX + 22;
+    float fLabelY = uiOriginY - m_LineList.size() * fLineHeight;
     for (const auto& dataLine : m_LineList)
     {
         const SGraphStatLine& line = dataLine.second;
@@ -230,10 +232,15 @@ void CGraphStats::Draw(void)
                 iDataPos = GRAPHSTAT_HISTORY_SIZE - 1;
 
             pGraphics->DrawLineQueued(uiOriginX + i - 1, uiOriginY - fY0, uiOriginX + i, uiOriginY - fY1, 1, line.color, true);
+
+            if (i == uiSizeX - 1)
+            {
+                // Line from graph to label
+                pGraphics->DrawLineQueued(uiOriginX + i - 1, uiOriginY - fY0, fLabelX - 2, fLabelY + fLineHeight / 2, 1, line.color, true);
+            }
         }
 
-        float fX = uiOriginX + uiSizeX + 2;
-        float fY = uiOriginY - line.dataHistory[line.iDataPos] * fLineScale - fHalfLineHeight;
-        pGraphics->DrawStringQueued(fX, fY, fX, fY, line.color, line.strName.c_str(), 1.0f, 1.0f, DT_NOCLIP, nullptr, true);
+        pGraphics->DrawStringQueued(fLabelX, fLabelY, fLabelX, fLabelY, line.color, line.strName.c_str(), 1.0f, 1.0f, DT_NOCLIP, nullptr, true);
+        fLabelY += fLineHeight;
     }
 }