Merge branch 'master' into 230724_Add_getLoadedFiles

Author: TracerDS

Client/core/CCommands.cpp

@@ -125,6 +125,7 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
 
     // Grab the command
     tagCOMMANDENTRY* pEntry = Get(szCommand);
+    bool             wasHandled = false;
     if (pEntry)
     {
         // If its a core command, or if its enabled
@@ -133,13 +134,16 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
             // Execute it
             if (!bIsScriptedBind || pEntry->bAllowScriptedBind)
                 ExecuteHandler(pEntry->pfnCmdFunc, szParameters);
+
+            wasHandled = true;
         }
     }
 
     // Recompose the original command text
     std::string val = std::string(szCommand) + " " + std::string(szParameters ? szParameters : "");
 
     // Is it a cvar? (syntax: cvar[ = value])
+    if (!wasHandled)
     {
         // Check to see if '=' exists
         unsigned int nOpIndex = val.find('=');
@@ -187,7 +191,7 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
 
     // HACK: if its a 'nick' command, save it here
     bool bIsNickCommand = !stricmp(szCommand, "nick");
-    if (bIsNickCommand && szParameters && !bIsScriptedBind)
+    if (!wasHandled && bIsNickCommand && szParameters && !bIsScriptedBind)
     {
         if (CCore::GetSingleton().IsValidNick(szParameters))
         {
@@ -208,10 +212,13 @@ bool CCommands::Execute(const char* szCommand, const char* szParametersIn, bool
     if (m_pfnExecuteHandler)
     {
         bool bAllowScriptedBind = (!pEntry || pEntry->bAllowScriptedBind);
-        if (m_pfnExecuteHandler(szCommand, szParameters, bHandleRemotely, (pEntry != NULL), bIsScriptedBind, bAllowScriptedBind))
+        if (m_pfnExecuteHandler(szCommand, szParameters, bHandleRemotely, wasHandled, bIsScriptedBind, bAllowScriptedBind))
             return true;
     }
 
+    if (wasHandled)
+        return true;
+
     // Unknown command
     val = _("Unknown command or cvar: ") + szCommand;
     if (!bIsScriptedBind && !bIsNickCommand && pEntry == nullptr)

Client/game_sa/CClockSA.cpp

@@ -30,3 +30,19 @@ void CClockSA::Get(BYTE* bHour, BYTE* bMinute)
     *bMinute = *(BYTE*)VAR_TimeMinutes;
     *bHour = *(BYTE*)VAR_TimeHours;
 }
+
+bool CClockSA::SetTimeFrozen(bool value) noexcept
+{
+    if (value)
+        MemSet((void*)0x53BFBD, 0x90, 5);
+    else
+        MemCpy((void*)0x53BFBD, "\xE8\x4E\x0F\xFF\xFF", 5);
+
+    m_bTimeCycleFrozen = value;
+    return true;
+}
+
+bool CClockSA::ResetTimeFrozen() noexcept
+{
+    return SetTimeFrozen(false);
+}

Client/game_sa/CClockSA.h

@@ -22,4 +22,11 @@ class CClockSA : public CClock
 public:
     void Set(BYTE bHour, BYTE bMinute);
     void Get(BYTE* bHour, BYTE* bMinute);
+
+    bool SetTimeFrozen(bool value) noexcept;
+    bool IsTimeFrozen() const noexcept { return m_bTimeCycleFrozen; };
+    bool ResetTimeFrozen() noexcept;
+
+private:
+    bool m_bTimeCycleFrozen;
 };

Client/game_sa/CGameSA.cpp

@@ -1005,18 +1005,14 @@ void CGameSA::GetShaderReplacementStats(SShaderReplacementStats& outStats)
     m_pRenderWare->GetShaderReplacementStats(outStats);
 }
 
-void CGameSA::RemoveAllBuildings(bool clearBuildingRemoval)
+void CGameSA::RemoveAllBuildings()
 {
     m_pIplStore->SetDynamicIplStreamingEnabled(false);
 
     m_pPools->GetDummyPool().RemoveAllBuildingLods();
     m_pPools->GetBuildingsPool().RemoveAllBuildings();
 
     auto pBuildingRemoval = static_cast<CBuildingRemovalSA*>(m_pBuildingRemoval);
-    if (clearBuildingRemoval)
-    {
-        pBuildingRemoval->ClearRemovedBuildingLists();
-    }
     pBuildingRemoval->DropCaches();
 
     m_isBuildingsRemoved = true;
@@ -1036,7 +1032,7 @@ bool CGameSA::SetBuildingPoolSize(size_t size)
     const bool shouldRemoveBuilding = !m_isBuildingsRemoved;
     if (shouldRemoveBuilding)
     {
-        RemoveAllBuildings(false);
+        RemoveAllBuildings();
     }
     else
     {

Client/game_sa/CGameSA.h

@@ -303,7 +303,7 @@ class CGameSA : public CGame
     PostWeaponFireHandler*  m_pPostWeaponFireHandler;
     TaskSimpleBeHitHandler* m_pTaskSimpleBeHitHandler;
 
-    void RemoveAllBuildings(bool clearBuildingRemoval = true);
+    void RemoveAllBuildings();
     void RestoreGameBuildings();
 
     bool SetBuildingPoolSize(size_t size);

Client/game_sa/CHandlingEntrySA.cpp

@@ -1,11 +1,11 @@
 /*****************************************************************************
  *
- *  PROJECT:     Multi Theft Auto v1.0
+ *  PROJECT:     Multi Theft Auto
  *  LICENSE:     See LICENSE in the top level directory
- *  FILE:        game_sa/CHandlingEntrySA.cpp
+ *  FILE:        Client/game_sa/CHandlingEntrySA.cpp
  *  PURPOSE:     Vehicle handling data entry
  *
- *  Multi Theft Auto is available from http://www.multitheftauto.com/
+ *  Multi Theft Auto is available from https://multitheftauto.com/
  *
  *****************************************************************************/
 
@@ -22,91 +22,89 @@ CHandlingEntrySA::CHandlingEntrySA()
     m_pHandlingSA = new tHandlingDataSA;
     memset(m_pHandlingSA, 0, sizeof(tHandlingDataSA));
     m_bDeleteInterface = true;
-
-    // We have no original data
-    m_pOriginalData = NULL;
-    m_bChanged = true;
 }
 
 CHandlingEntrySA::CHandlingEntrySA(tHandlingDataSA* pOriginal)
 {
     // Store gta's pointer
-    m_pHandlingSA = NULL;
-    m_pOriginalData = NULL;
+    m_pHandlingSA = nullptr;
     m_bDeleteInterface = false;
     memcpy(&m_Handling, pOriginal, sizeof(tHandlingDataSA));
-    m_bChanged = true;
 }
 
 CHandlingEntrySA::~CHandlingEntrySA()
 {
-    if (m_bChanged)
-    {
-        pGame->GetHandlingManager()->RemoveChangedVehicle();
-    }
     if (m_bDeleteInterface)
     {
-        delete m_pHandlingSA;
+        SAFE_DELETE(m_pHandlingSA);
     }
 }
 
 // Apply the handlingdata from another data
-void CHandlingEntrySA::Assign(const CHandlingEntry* pData)
+void CHandlingEntrySA::Assign(const CHandlingEntry* pEntry)
 {
+    if (!pEntry)
+        return;
+
     // Copy the data
-    const CHandlingEntrySA* pEntrySA = static_cast<const CHandlingEntrySA*>(pData);
+    const CHandlingEntrySA* pEntrySA = static_cast<const CHandlingEntrySA*>(pEntry);
     m_Handling = pEntrySA->m_Handling;
-    if (m_bChanged)
-    {
-        pGame->GetHandlingManager()->RemoveChangedVehicle();
-    }
-    pGame->GetHandlingManager()->CheckSuspensionChanges(this);
 }
 
-void CHandlingEntrySA::Recalculate(unsigned short usModel)
+void CHandlingEntrySA::Recalculate()
 {
     // Real GTA class?
-    if (m_pHandlingSA)
-    {
-        // Copy our stored field to GTA's
-        memcpy(m_pHandlingSA, &m_Handling, sizeof(m_Handling));
-        ((void(_stdcall*)(tHandlingDataSA*))FUNC_HandlingDataMgr_ConvertDataToGameUnits)(m_pHandlingSA);
-    }
+    if (!m_pHandlingSA)
+        return;
+
+    // Copy our stored field to GTA's
+    memcpy(m_pHandlingSA, &m_Handling, sizeof(m_Handling));
+    ((void(_stdcall*)(tHandlingDataSA*))FUNC_HandlingDataMgr_ConvertDataToGameUnits)(m_pHandlingSA);
 }
 
-// Moved to cpp to check suspension changes against default values to make sure the handling hasn't changed.
-void CHandlingEntrySA::SetSuspensionForceLevel(float fForce)
+void CHandlingEntrySA::SetSuspensionForceLevel(float fForce) noexcept
 {
+    CheckSuspensionChanges();
     m_Handling.fSuspensionForceLevel = fForce;
-    pGame->GetHandlingManager()->CheckSuspensionChanges(this);
 }
-void CHandlingEntrySA::SetSuspensionDamping(float fDamping)
+
+void CHandlingEntrySA::SetSuspensionDamping(float fDamping) noexcept
 {
+    CheckSuspensionChanges();
     m_Handling.fSuspensionDamping = fDamping;
-    pGame->GetHandlingManager()->CheckSuspensionChanges(this);
 }
-void CHandlingEntrySA::SetSuspensionHighSpeedDamping(float fDamping)
+
+void CHandlingEntrySA::SetSuspensionHighSpeedDamping(float fDamping) noexcept
 {
+    CheckSuspensionChanges();
     m_Handling.fSuspensionHighSpdDamping = fDamping;
-    pGame->GetHandlingManager()->CheckSuspensionChanges(this);
 }
-void CHandlingEntrySA::SetSuspensionUpperLimit(float fUpperLimit)
+
+void CHandlingEntrySA::SetSuspensionUpperLimit(float fUpperLimit) noexcept
 {
+    CheckSuspensionChanges();
     m_Handling.fSuspensionUpperLimit = fUpperLimit;
-    pGame->GetHandlingManager()->CheckSuspensionChanges(this);
 }
-void CHandlingEntrySA::SetSuspensionLowerLimit(float fLowerLimit)
+
+void CHandlingEntrySA::SetSuspensionLowerLimit(float fLowerLimit) noexcept
 {
+    CheckSuspensionChanges();
     m_Handling.fSuspensionLowerLimit = fLowerLimit;
-    pGame->GetHandlingManager()->CheckSuspensionChanges(this);
 }
-void CHandlingEntrySA::SetSuspensionFrontRearBias(float fBias)
+
+void CHandlingEntrySA::SetSuspensionFrontRearBias(float fBias) noexcept
 {
+    CheckSuspensionChanges();
     m_Handling.fSuspensionFrontRearBias = fBias;
-    pGame->GetHandlingManager()->CheckSuspensionChanges(this);
 }
-void CHandlingEntrySA::SetSuspensionAntiDiveMultiplier(float fAntidive)
+
+void CHandlingEntrySA::SetSuspensionAntiDiveMultiplier(float fAntidive) noexcept
 {
+    CheckSuspensionChanges();
     m_Handling.fSuspensionAntiDiveMultiplier = fAntidive;
+}
+
+void CHandlingEntrySA::CheckSuspensionChanges() noexcept
+{
     pGame->GetHandlingManager()->CheckSuspensionChanges(this);
 }