Merge branch 'master' into custom_ifp_animations

Author: saml1er

Client/core/CSettings.cpp

@@ -997,7 +997,6 @@ void CSettings::CreateGUI(void)
     m_pDebugSettingCombo->AddItem("#0000 Lua trace")->SetData((void*)EDiagnosticDebug::LUA_TRACE_0000);
     m_pDebugSettingCombo->AddItem("#0000 Resize always")->SetData((void*)EDiagnosticDebug::RESIZE_ALWAYS_0000);
     m_pDebugSettingCombo->AddItem("#0000 Resize never")->SetData((void*)EDiagnosticDebug::RESIZE_NEVER_0000);
-    m_pDebugSettingCombo->AddItem("#0000 Marker pulse")->SetData((void*)EDiagnosticDebug::MARKER_PULSE);
     m_pDebugSettingCombo->SetReadOnly(true);
     vecTemp.fY += fLineHeight;
 

Client/mods/deathmatch/logic/CClientEntity.cpp

@@ -60,7 +60,6 @@ CClientEntity::CClientEntity(ElementID ID) : ClassInit(this)
     g_pCore->UpdateDummyProgress();
 }
 
-#pragma inline_depth(0)
 CClientEntity::~CClientEntity(void)
 {
     // Make sure we won't get deleted later by the element deleter if we've been requested so
@@ -165,7 +164,6 @@ CClientEntity::~CClientEntity(void)
     g_pCore->GetGraphics()->GetRenderItemManager()->RemoveClientEntityRefs(this);
     g_pCore->UpdateDummyProgress();
 }
-#pragma inline_depth(254)
 
 // Static function
 // bool CClientEntity::IsValidEntity ( CClientEntity* pEntity )

Client/mods/deathmatch/logic/CClientMarkerManager.cpp

@@ -53,43 +53,12 @@ void CClientMarkerManager::DeleteAll(void)
 
 void CClientMarkerManager::DoPulse(void)
 {
-    uint uiSkipCount = 0;
-    uint uiAddCount = 0;
     m_Markers.SuspendModifyOperations();
     // Pulse all our markers
     CFastList<CClientMarker*>::const_iterator iter = m_Markers.begin();
     for (; iter != m_Markers.end(); iter++)
     {
-        bool bSkip = false;
-        for (auto suspended : m_Markers.m_SuspendedOperationList)
-        {
-            if (suspended.item == (*iter))
-                bSkip = true;
-        }
-        if (!bSkip)
-            (*iter)->DoPulse();
-        else
-            uiSkipCount++;
-    }
-
-    for (uint i = 0; i < m_Markers.m_SuspendedOperationList.size(); i++)
-    {
-        auto suspended = m_Markers.m_SuspendedOperationList[i];
-        if (suspended.operation != CFastList<CClientMarker*>::EOperation::Remove)
-        {
-            suspended.item->DoPulse();
-            uiAddCount++;
-        }
+        (*iter)->DoPulse();
     }
     m_Markers.ResumeModifyOperations();
-
-    // Debug logging
-    static uint uiSkipCountNonZeroes = 0;
-    static uint uiAddCountNonZeroes = 0;
-    if ((uiSkipCount && uiSkipCountNonZeroes < 5) || (uiAddCount && uiAddCountNonZeroes < 5))
-    {
-        uiSkipCountNonZeroes += (uiSkipCount ? 1 : 0);
-        uiAddCountNonZeroes += (uiAddCount ? 1 : 0);
-        AddReportLog(4450, SString("CClientMarkerManager::DoPulse uiSkipCount:%d uiAddCount:%d", uiSkipCount, uiAddCount));
-    }
 }

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -1927,7 +1927,7 @@ bool CStaticFunctionDefinitions::SetPlayerNametagShowing(CClientEntity& Entity,
 {
     RUN_CHILDREN(SetPlayerNametagShowing(**iter, bShowing))
 
-    if (IS_PED(&Entity))
+    if (IS_PLAYER(&Entity))
     {
         CClientPlayer& Player = static_cast<CClientPlayer&>(Entity);
 

Shared/sdk/SharedUtil.Game.h

@@ -99,7 +99,6 @@ namespace SharedUtil
             LUA_TRACE_0000,
             RESIZE_ALWAYS_0000,
             RESIZE_NEVER_0000,
-            MARKER_PULSE,
             MAX,
         };
     };