Merge branch 'master' into 260624_Refactoring_Part-4

TracerDS · web-flow · commit 5c3d1ba63fe9 · 2024-08-27T17:57:16.000+02:00
diff --git a/.github/workflows/dockerimage.yaml b/.github/workflows/dockerimage.yaml
@@ -12,8 +12,6 @@ on:
     - 'Dockerfile.i386'
     - 'Dockerfile.armhf'
     - 'Dockerfile.arm64'
-    - 'Dockerfile.osx-x64'
-    - 'Dockerfile.osx-arm64'
 
 jobs:
   build:
@@ -28,10 +26,6 @@ jobs:
           dockerfile: Dockerfile.armhf
         - tag: arm64
           dockerfile: Dockerfile.arm64
-        - tag: osx-x64
-          dockerfile: Dockerfile.osx-x64
-        - tag: osx-arm64
-          dockerfile: Dockerfile.osx-arm64
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
diff --git a/Client/core/CCore.cpp b/Client/core/CCore.cpp
@@ -2181,11 +2181,6 @@ CModelCacheManager* CCore::GetModelCacheManager()
     return m_pModelCacheManager;
 }
 
-void CCore::AddModelToPersistentCache(ushort usModelId)
-{
-    return GetModelCacheManager()->AddModelToPersistentCache(usModelId);
-}
-
 void CCore::StaticIdleHandler()
 {
     g_pCore->IdleHandler();
diff --git a/Client/core/CCore.h b/Client/core/CCore.h
@@ -253,7 +253,6 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     EDiagnosticDebugType GetDiagnosticDebug();
     void                 SetDiagnosticDebug(EDiagnosticDebugType value);
     CModelCacheManager*  GetModelCacheManager();
-    void                 AddModelToPersistentCache(ushort usModelId);
 
     static void StaticIdleHandler();
     void        IdleHandler();
diff --git a/Client/core/CModelCacheManager.cpp b/Client/core/CModelCacheManager.cpp
@@ -47,7 +47,6 @@ class CModelCacheManagerImpl : public CModelCacheManager
     virtual void OnClientClose();
     virtual void UpdatePedModelCaching(const std::map<ushort, float>& newNeedCacheList);
     virtual void UpdateVehicleModelCaching(const std::map<ushort, float>& newNeedCacheList);
-    virtual void AddModelToPersistentCache(ushort usModelId);
     virtual void SetCustomLimits(std::optional<size_t> numVehicles, std::optional<size_t> numPeds);
 
     // CModelCacheManagerImpl methods
@@ -72,7 +71,6 @@ class CModelCacheManagerImpl : public CModelCacheManager
     bool                              m_IsUsingCustomVehicleCacheLimit{}; //< If `true` the value is set by the scripter, otherwise is calculated in `DoPulse()`
     std::map<ushort, SModelCacheInfo> m_PedModelCacheInfoMap{};
     std::map<ushort, SModelCacheInfo> m_VehicleModelCacheInfoMap{};
-    std::set<ushort>                  m_PermoLoadedModels{};
 };
 
 ///////////////////////////////////////////////////////////////
@@ -266,22 +264,6 @@ void CModelCacheManagerImpl::DoPulse()
     }
 }
 
-///////////////////////////////////////////////////////////////
-//
-// CModelCacheManagerImpl::AddModelToPersistentCache
-//
-// Keep this model around 4 evar now
-//
-///////////////////////////////////////////////////////////////
-void CModelCacheManagerImpl::AddModelToPersistentCache(ushort usModelId)
-{
-    if (!MapContains(m_PermoLoadedModels, usModelId))
-    {
-        AddModelRefCount(usModelId);
-        MapInsert(m_PermoLoadedModels, usModelId);
-    }
-}
-
 ///////////////////////////////////////////////////////////////
 //
 // CModelCacheManagerImpl::UpdatePedModelCaching
@@ -542,13 +524,5 @@ void CModelCacheManagerImpl::OnRestreamModel(ushort usModelId)
                 OutputDebugLine(SString("[Cache] End caching model %d  (OnRestreamModel)", usModelId));
             }
         }
-    }
-
-    // Also check the permo list
-    if (MapContains(m_PermoLoadedModels, usModelId))
-    {
-        SubModelRefCount(usModelId);
-        MapRemove(m_PermoLoadedModels, usModelId);
-        OutputDebugLine(SString("[Cache] End permo-caching model %d  (OnRestreamModel)", usModelId));
-    }
+    }   
 }
diff --git a/Client/core/CModelCacheManager.h b/Client/core/CModelCacheManager.h
@@ -24,7 +24,6 @@ class CModelCacheManager
     virtual void OnClientClose() = 0;
     virtual void UpdatePedModelCaching(const std::map<ushort, float>& newNeedCacheList) = 0;
     virtual void UpdateVehicleModelCaching(const std::map<ushort, float>& newNeedCacheList) = 0;
-    virtual void AddModelToPersistentCache(ushort usModelId) = 0;
     virtual void SetCustomLimits(std::optional<size_t> numVehicles, std::optional<size_t> numPeds) = 0;
 };
 
diff --git a/Client/game_sa/CPedSA.cpp b/Client/game_sa/CPedSA.cpp
@@ -98,8 +98,12 @@ void CPedSA::Init()
 
 void CPedSA::SetModelIndex(DWORD dwModelIndex)
 {
-    DWORD dwFunction = FUNC_SetModelIndex;
+    // Delete any existing RwObject first
+    GetPedInterface()->DeleteRwObject();
+
+    // Set new model
     DWORD dwThis = (DWORD)GetInterface();
+    DWORD dwFunction = FUNC_SetModelIndex;
     _asm
     {
         mov     ecx, dwThis
@@ -116,16 +120,6 @@ void CPedSA::SetModelIndex(DWORD dwModelIndex)
     }
 }
 
-// Hacky thing done for the local player when changing model
-void CPedSA::RemoveGeometryRef()
-{
-    RpClump*    pClump = (RpClump*)GetInterface()->m_pRwObject;
-    RpAtomic*   pAtomic = (RpAtomic*)((pClump->atomics.root.next) - 0x8);
-    RpGeometry* pGeometry = pAtomic->geometry;
-    if (pGeometry->refs > 1)
-        pGeometry->refs--;
-}
-
 bool CPedSA::IsInWater()
 {
     CTask* pTask = m_pPedIntelligence->GetTaskManager()->GetTask(TASK_PRIORITY_EVENT_RESPONSE_NONTEMP);
diff --git a/Client/game_sa/CPedSA.h b/Client/game_sa/CPedSA.h
@@ -295,7 +295,6 @@ class CPedSA : public virtual CPed, public virtual CPhysicalSA
     CPedSAInterface* GetPedInterface() { return (CPedSAInterface*)GetInterface(); }
     void             Init();
     void             SetModelIndex(DWORD dwModelIndex);
-    void             RemoveGeometryRef();
     void             AttachPedToEntity(DWORD dwEntityInterface, CVector* vector, unsigned short sDirection, float fRotationLimit, eWeaponType weaponType,
                                        bool bChangeCamera);
     void             DetachPedFromEntity();
diff --git a/Client/mods/deathmatch/logic/CClientPed.cpp b/Client/mods/deathmatch/logic/CClientPed.cpp
@@ -3927,22 +3927,7 @@ void CClientPed::_ChangeModel()
                 // So make sure clothes geometry is built now...
                 m_pClothes->AddAllToModel();
                 m_pPlayerPed->RebuildPlayer();
-
-                // ...and decrement the extra ref
-            #ifdef NO_CRASH_FIX_TEST2
-                m_pPlayerPed->RemoveGeometryRef();
-            #endif
-            }
-            else
-            {
-                // When the local player changes to another (non CJ) model, the geometry gets an extra ref from somewhere, causing a memory leak.
-                // So decrement the extra ref here
-            #ifdef NO_CRASH_FIX_TEST
-                m_pPlayerPed->RemoveGeometryRef();
-            #endif
-                // As we will have problem removing the geometry later, we might as well keep the model cached until exit
-                g_pCore->AddModelToPersistentCache((ushort)m_ulModel);
-            }
+            }    
 
             // Remove reference to the old model we used (Flag extra GTA reference to be removed as well)
             pLoadedModel->RemoveRef(true);
diff --git a/Client/mods/deathmatch/logic/CResourceModelStreamer.cpp b/Client/mods/deathmatch/logic/CResourceModelStreamer.cpp
@@ -106,7 +106,11 @@ void CResourceModelStreamer::ReleaseAll()
 
 void CResourceModelStreamer::FullyReleaseModel(std::uint16_t modelId)
 {
-    std::uint16_t &refsCount = m_requestedModels[modelId];
+    auto refs = m_requestedModels.find(modelId);
+    if (refs == m_requestedModels.end())
+        return;
+
+    std::uint16_t& refsCount = refs->second;
 
     if (refsCount > 0)
     {
diff --git a/Client/sdk/core/CCoreInterface.h b/Client/sdk/core/CCoreInterface.h
@@ -160,7 +160,6 @@ class CCoreInterface
     virtual EDiagnosticDebugType GetDiagnosticDebug() = 0;
     virtual void                 SetDiagnosticDebug(EDiagnosticDebugType value) = 0;
     virtual CModelCacheManager*  GetModelCacheManager() = 0;
-    virtual void                 AddModelToPersistentCache(ushort usModelId) = 0;
     virtual void                 UpdateDummyProgress(int iValue = -1, const char* szType = "") = 0;
     virtual void                 SetDummyProgressUpdateAlways(bool bAlways) = 0;
 
diff --git a/Client/sdk/game/CPed.h b/Client/sdk/game/CPed.h
@@ -191,7 +191,6 @@ class CPed : public virtual CPhysical
     virtual void      Respawn(CVector* position, bool bCameraCut) = 0;
 
     virtual void SetModelIndex(unsigned long ulModel) = 0;
-    virtual void RemoveGeometryRef() = 0;
 
     virtual float    GetHealth() = 0;
     virtual void     SetHealth(float fHealth) = 0;
diff --git a/Dockerfile b/Dockerfile
@@ -15,7 +15,7 @@ ENV AS_BUILDAGENT=0 \
 RUN apt-get update && \
     apt-get install -y software-properties-common wget ca-certificates git build-essential \
         gcc-10 g++-10 curl subversion ncftp \
-        libncurses-dev libncursesw5 libmysqlclient-dev
+        libncurses-dev libncursesw6 libmysqlclient-dev
 
 # Set build directory
 VOLUME /build
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
@@ -21,7 +21,7 @@ RUN sed -i 's/deb http/deb \[arch=amd64,i386\] http/' /etc/apt/sources.list && \
     apt-get update && \
     apt-get install -y make git ncftp \
         gcc-10-aarch64-linux-gnu g++-10-aarch64-linux-gnu \
-        libncursesw5:arm64 libncursesw5-dev:arm64 libmysqlclient-dev:arm64
+        libncurses-dev:arm64 libncursesw6:arm64 libmysqlclient-dev:arm64
 
 # Set build directory
 VOLUME /build
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
@@ -21,7 +21,7 @@ RUN sed -i 's/deb http/deb \[arch=amd64,i386\] http/' /etc/apt/sources.list && \
     apt-get update && \
     apt-get install -y make git ncftp \
         gcc-10-arm-linux-gnueabihf g++-10-arm-linux-gnueabihf \
-        libncursesw5:armhf libncursesw5-dev:armhf libmysqlclient-dev:armhf
+        libncurses-dev:armhf libncursesw6:armhf libmysqlclient-dev:armhf
 
 # Set build directory
 VOLUME /build
diff --git a/Dockerfile.i386 b/Dockerfile.i386
@@ -15,7 +15,7 @@ ENV AS_BUILDAGENT=0 \
 RUN dpkg --add-architecture i386 && apt-get update && \
     apt-get install -y software-properties-common wget ca-certificates git build-essential \
         gcc-10-multilib g++-10-multilib curl subversion ncftp \
-        libncurses-dev:i386 libncursesw5:i386 libmysqlclient-dev:i386
+        libncurses-dev:i386 libncursesw6:i386 libmysqlclient-dev:i386
 
 # Set build directory
 VOLUME /build
diff --git a/Dockerfile.osx-arm64 b/Dockerfile.osx-arm64
diff --git a/Dockerfile.osx-x64 b/Dockerfile.osx-x64
diff --git a/README.md b/README.md
@@ -64,8 +64,8 @@ You can build the MTA:SA server on GNU/Linux distributions only for x86, x86_64,
 - git
 - make
 - GNU GCC compiler (version 10 or newer)
-- libncursesw5
-- libncursesw5-dev
+- libncursesw6
+- libncurses-dev
 - libmysqlclient-dev
 
 **Build instructions: Script**
diff --git a/Server/core/premake5.lua b/Server/core/premake5.lua
@@ -44,7 +44,7 @@ project "Core"
 		links { "breakpad", "rt" }
 		buildoptions { "-pthread" }
 		linkoptions { "-pthread" }
-		linkoptions { "-l:libncursesw.so.5" }
+		linkoptions { "-l:libncursesw.so.6" }
 
 	filter "system:macosx"
 		links { "ncurses", "breakpad", "CoreFoundation.framework" }
diff --git a/Shared/mods/deathmatch/logic/lua/CLuaTimer.cpp b/Shared/mods/deathmatch/logic/lua/CLuaTimer.cpp
@@ -68,5 +68,5 @@ CTickCount CLuaTimer::GetTimeLeft()
 {
     CTickCount llCurrentTime = CTickCount::Now();
     CTickCount llTimeLeft = m_llStartTime + m_llDelay - llCurrentTime;
-    return llTimeLeft;
+    return llTimeLeft.ToLongLong() < 0LL ? CTickCount(0LL) : llTimeLeft;
 }
diff --git a/utils/docker-entrypoint-osx.sh b/utils/docker-entrypoint-osx.sh
diff --git a/vendor/google-breakpad/src/client/linux/handler/minidump_descriptor.h b/vendor/google-breakpad/src/client/linux/handler/minidump_descriptor.h
@@ -34,6 +34,7 @@
 #include <sys/types.h>
 
 #include <string>
+#include <cstdint>
 
 #include "client/linux/handler/microdump_extra_info.h"
 #include "common/using_std_string.h"

Original file line number	Diff line number	Diff line change
`@@ -2181,11 +2181,6 @@ CModelCacheManager* CCore::GetModelCacheManager()`
`2181`	`2181`	`return m_pModelCacheManager;`
`2182`	`2182`	`}`
`2183`	`2183`
`2184`		`-void CCore::AddModelToPersistentCache(ushort usModelId)`
`2185`		`-{`
`2186`		`- return GetModelCacheManager()->AddModelToPersistentCache(usModelId);`
`2187`		`-}`
`2188`		`-`
`2189`	`2184`	`void CCore::StaticIdleHandler()`
`2190`	`2185`	`{`
`2191`	`2186`	`g_pCore->IdleHandler();`
Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,12 @@ void CPedSA::Init()`
`98`	`98`
`99`	`99`	`void CPedSA::SetModelIndex(DWORD dwModelIndex)`
`100`	`100`	`{`
`101`		`- DWORD dwFunction = FUNC_SetModelIndex;`
	`101`	`+ // Delete any existing RwObject first`
	`102`	`+ GetPedInterface()->DeleteRwObject();`
	`103`	`+`
	`104`	`+ // Set new model`
`102`	`105`	`DWORD dwThis = (DWORD)GetInterface();`
	`106`	`+ DWORD dwFunction = FUNC_SetModelIndex;`
`103`	`107`	`_asm`
`104`	`108`	`{`
`105`	`109`	`mov ecx, dwThis`
`@@ -116,16 +120,6 @@ void CPedSA::SetModelIndex(DWORD dwModelIndex)`
`116`	`120`	`}`
`117`	`121`	`}`
`118`	`122`
`119`		`-// Hacky thing done for the local player when changing model`
`120`		`-void CPedSA::RemoveGeometryRef()`
`121`		`-{`
`122`		`- RpClump* pClump = (RpClump*)GetInterface()->m_pRwObject;`
`123`		`- RpAtomic* pAtomic = (RpAtomic*)((pClump->atomics.root.next) - 0x8);`
`124`		`- RpGeometry* pGeometry = pAtomic->geometry;`
`125`		`- if (pGeometry->refs > 1)`
`126`		`- pGeometry->refs--;`
`127`		`-}`
`128`		`-`
`129`	`123`	`bool CPedSA::IsInWater()`
`130`	`124`	`{`
`131`	`125`	`CTask* pTask = m_pPedIntelligence->GetTaskManager()->GetTask(TASK_PRIORITY_EVENT_RESPONSE_NONTEMP);`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,11 @@ void CResourceModelStreamer::ReleaseAll()`
`106`	`106`
`107`	`107`	`void CResourceModelStreamer::FullyReleaseModel(std::uint16_t modelId)`
`108`	`108`	`{`
`109`		`- std::uint16_t &refsCount = m_requestedModels[modelId];`
	`109`	`+ auto refs = m_requestedModels.find(modelId);`
	`110`	`+ if (refs == m_requestedModels.end())`
	`111`	`+ return;`
	`112`	`+`
	`113`	`+ std::uint16_t& refsCount = refs->second;`
`110`	`114`
`111`	`115`	`if (refsCount > 0)`
`112`	`116`	`{`