Merge branch 'master' into feature/custom_projectiles

Author: FileEX

.github/workflows/codeql.yml

@@ -47,10 +47,6 @@ jobs:
           build-mode: none
         - language: c-cpp
           build-mode: autobuild
-        - language: javascript-typescript
-          build-mode: none
-        - language: python
-          build-mode: none
         # CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'rust', 'swift'
         # Use `c-cpp` to analyze code written in C, C++ or both
         # Use 'java-kotlin' to analyze code written in Java, Kotlin or both

Client/game_sa/CRenderWareSA.cpp

@@ -285,7 +285,18 @@ RpClump* CRenderWareSA::ReadDFF(const SString& strFilename, const SString& buffe
 
     // rockstar's collision hack: set the global particle emitter to the modelinfo pointer of this model
     if (bLoadEmbeddedCollisions)
+    {
+        // Vehicles have their collision loaded through the CollisionModel plugin, so we need to remove the current collision to prevent a memory leak.
+        // This needs to be done here before reading the stream data, because plugins are read in RpClumpStreamRead.
+        CModelInfo* modelInfo = pGame->GetModelInfo(usModelID);
+        if (modelInfo)
+        {
+            if (auto* modelInfoInterface = modelInfo->GetInterface())
+                ((void(__thiscall*)(CBaseModelInfoSAInterface*))0x4C4C40)(modelInfoInterface); // CBaseModelInfo::DeleteCollisionModel
+        }
+
         RpPrtStdGlobalDataSetStreamEmbedded((void*)pPool[usModelID]);
+    }
 
     // read the clump with all its extensions
     RpClump* pClump = RpClumpStreamRead(streamModel);

Client/game_sa/TaskJumpFallSA.h

@@ -31,8 +31,8 @@ class CTaskSimpleClimbSAInterface : public CTaskSimpleSAInterface
     bool          m_bChangePosition;
     bool          m_bForceClimb;
     bool          m_bInvalidClimb;
-    char          m_nHeightForAnim;
-    char          m_nHeightForPos;
+    eClimbHeights m_nHeightForAnim;
+    eClimbHeights m_nHeightForPos;
     unsigned char m_nSurfaceType;
     char          m_nFallAfterVault;
     float         m_fHandholdHeading;
@@ -49,6 +49,8 @@ class CTaskSimpleClimbSA : public virtual CTaskSimpleSA, public virtual CTaskSim
     CTaskSimpleClimbSA(){};
     CTaskSimpleClimbSA(CEntity* pClimbEnt, const CVector& vecTarget, float fHeading, unsigned char nSurfaceType, char nHeight = CLIMB_GRAB,
                        const bool bForceClimb = false);
+
+    eClimbHeights GetHeightForPos() const override { return static_cast<const CTaskSimpleClimbSAInterface*>(GetInterface())->m_nHeightForPos; }
 };
 
 // ##############################################################################

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -241,6 +241,7 @@ void CClientPed::Init(CClientManager* pManager, unsigned long ulModelID, bool bI
     m_MovementStateNames[MOVEMENTSTATE_ASCENT_JETPACK] = "ascent_jetpack";
     m_MovementStateNames[MOVEMENTSTATE_DESCENT_JETPACK] = "descent_jetpack";
     m_MovementStateNames[MOVEMENTSTATE_JETPACK] = "jetpack_flying";
+    m_MovementStateNames[MOVEMENTSTATE_HANGING] = "hanging";
 
     // Create the player model
     if (m_bIsLocalPlayer)
@@ -2426,7 +2427,13 @@ eMovementState CClientPed::GetMovementState()
 
         // Check tasks
         if (strcmp(szSimpleTaskName, "TASK_SIMPLE_CLIMB") == 0) // Is he climbing?
+        {
+            CTaskSimpleClimb* climbingTask = dynamic_cast<CTaskSimpleClimb*>(GetTaskManager()->GetSimplestActiveTask());
+            if (climbingTask && climbingTask->GetHeightForPos() == eClimbHeights::CLIMB_GRAB)
+                return MOVEMENTSTATE_HANGING;
+
             return MOVEMENTSTATE_CLIMB;
+        }
         else if (strcmp(szComplexTaskName, "TASK_COMPLEX_JUMP") == 0) // Is he jumping?
             return MOVEMENTSTATE_JUMP;
         else if (strcmp(szSimpleTaskName, "TASK_SIMPLE_GO_TO_POINT") == 0) // Entering vehicle (walking to the doors)?

Client/mods/deathmatch/logic/CClientPed.h

@@ -82,6 +82,7 @@ enum eMovementState
     MOVEMENTSTATE_ASCENT_JETPACK,             // Ascending with jetpack
     MOVEMENTSTATE_DESCENT_JETPACK,            // Descending with jetpack
     MOVEMENTSTATE_JETPACK,                    // Jetpack flying
+    MOVEMENTSTATE_HANGING,                    // Hanging from the whall during climbing task
 };
 
 enum eDeathAnims

Client/mods/deathmatch/logic/lua/CLuaFunctionDefs.Util.cpp

@@ -238,7 +238,7 @@ int CLuaFunctionDefs::GetKeyboardLayout(lua_State* luaVM)
             case 0:            // Left to right (English)
                 readingLayout = "ltr";
                 break;
-            case 1:            // Right to left (Arabic, Hebrew)
+            case 1:            // Right to left (Arabic, Hebrew, and Persian)
                 readingLayout = "rtl";
                 break;
             case 2:            // Vertical top to bottom with columns to the left and also left to right (Japanese)

Client/sdk/game/CTasks.h

@@ -52,7 +52,7 @@ class CVehicle;
 typedef unsigned long AssocGroupId;
 typedef unsigned long AnimationId;
 
-enum eClimbHeights
+enum eClimbHeights : std::int8_t
 {
     CLIMB_NOT_READY = 0,
     CLIMB_GRAB,

Client/sdk/game/TaskJumpFall.h

@@ -13,10 +13,14 @@
 
 #include "Task.h"
 
+enum eClimbHeights : std::int8_t;
+
 class CTaskSimpleClimb : public virtual CTaskSimple
 {
 public:
     virtual ~CTaskSimpleClimb(){};
+
+    virtual eClimbHeights GetHeightForPos() const = 0;
 };
 
 class CTaskSimpleJetPack : public virtual CTaskSimple

Server/mods/deathmatch/logic/CGame.cpp

@@ -421,6 +421,7 @@ CGame::~CGame()
     SAFE_DELETE(m_pASE);
     SAFE_RELEASE(m_pHqComms);
     CSimControl::Shutdown();
+    CThreadPool::getDefaultThreadPool().shutdown();
 
     // Clear our global pointer
     g_pGame = NULL;

Shared/XML/CXMLNodeImpl.cpp

@@ -328,7 +328,7 @@ void CXMLNodeImpl::SetTagContent(float fContent)
 {
     // Convert to string and set it
     char szBuffer[40];
-    sprintf(szBuffer, "%f", fContent);
+    snprintf(szBuffer, sizeof(szBuffer), "%f", fContent);
     SetTagContent(szBuffer);
 }