Add setPedAnimationSpeed

bool setPedAnimationProgress ( ped thePed, string anim, float speed )

Allows you to set the speed of any running animation from 0.0 - 1.0. It can be also used to fix swimming speed for higher fps.

Author: codenulls

Client/game_sa/CAnimBlendAssociationSA.h

@@ -63,6 +63,7 @@ class CAnimBlendAssociationSA : public CAnimBlendAssociation
     float GetBlendAmount() { return m_pInterface->fBlendAmount; }
     void  SetBlendAmount(float fAmount) { m_pInterface->fBlendAmount = fAmount; }
     void  SetCurrentProgress(float fProgress);
+    void  SetCurrentSpeed(float fSpeed) { m_pInterface->fSpeed = fSpeed; }
     void  SetAnimID(short sAnimID) { m_pInterface->sAnimID = sAnimID; }
     void  SetAnimGroup(short sAnimGroup) { m_pInterface->sAnimGroup = sAnimGroup; }
     void  SetFlags(short sFlags) { m_pInterface->sFlags = sFlags; }

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -2187,6 +2187,27 @@ bool CStaticFunctionDefinitions::SetPedAnimationProgress(CClientEntity& Entity,
     return false;
 }
 
+bool CStaticFunctionDefinitions::SetPedAnimationSpeed(CClientEntity& Entity, const SString& strAnimName, float fSpeed)
+{
+    RUN_CHILDREN(SetPedAnimationSpeed(**iter, strAnimName, fSpeed))
+
+        if (IS_PED(&Entity))
+        {
+            CClientPed& Ped = static_cast<CClientPed&>(Entity);
+            if (!strAnimName.empty())
+            {
+                auto pAnimAssociation = g_pGame->GetAnimManager()->RpAnimBlendClumpGetAssociation(Ped.GetClump(), strAnimName);
+                if (pAnimAssociation)
+                {
+                    pAnimAssociation->SetCurrentSpeed(fSpeed);
+                    return true;
+                }
+            }
+        }
+
+    return false;
+}
+
 bool CStaticFunctionDefinitions::SetPedMoveAnim(CClientEntity& Entity, unsigned int iMoveAnim)
 {
     RUN_CHILDREN(SetPedMoveAnim(**iter, iMoveAnim))

Client/mods/deathmatch/logic/CStaticFunctionDefinitions.h

@@ -170,6 +170,7 @@ class CStaticFunctionDefinitions
     static bool SetPedAnimation(CClientEntity& Entity, const SString& strBlockName, const char* szAnimName, int iTime, int iBlend, bool bLoop,
                                 bool bUpdatePosition, bool bInterruptable, bool bFreezeLastFrame);
     static bool SetPedAnimationProgress(CClientEntity& Entity, const SString& strAnimName, float fProgress);
+    static bool SetPedAnimationSpeed(CClientEntity& Entity, const SString& strAnimName, float fSpeed);
     static bool SetPedMoveAnim(CClientEntity& Entity, unsigned int iMoveAnim);
     static bool AddPedClothes(CClientEntity& Entity, const char* szTexture, const char* szModel, unsigned char ucType);
     static bool RemovePedClothes(CClientEntity& Entity, unsigned char ucType);

Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp

@@ -67,6 +67,7 @@ void CLuaPedDefs::LoadFunctions(void)
     CLuaCFunctions::AddFunction("setPedCanBeKnockedOffBike", SetPedCanBeKnockedOffBike);
     CLuaCFunctions::AddFunction("setPedAnimation", SetPedAnimation);
     CLuaCFunctions::AddFunction("setPedAnimationProgress", SetPedAnimationProgress);
+    CLuaCFunctions::AddFunction("setPedAnimationSpeed", SetPedAnimationSpeed);
     CLuaCFunctions::AddFunction("setPedWalkingStyle", SetPedMoveAnim);
     CLuaCFunctions::AddFunction("addPedClothes", AddPedClothes);
     CLuaCFunctions::AddFunction("removePedClothes", RemovePedClothes);
@@ -150,6 +151,7 @@ void CLuaPedDefs::AddClass(lua_State* luaVM)
     lua_classfunction(luaVM, "setAnalogControlState", "setPedAnalogControlState");
     lua_classfunction(luaVM, "setAnimation", "setPedAnimation");
     lua_classfunction(luaVM, "setAnimationProgress", "setPedAnimationProgress");
+    lua_classfunction(luaVM, "setAnimationSpeed", "setPedAnimationSpeed");
     lua_classfunction(luaVM, "setCameraRotation", "setPedCameraRotation");
     lua_classfunction(luaVM, "setControlState", "setPedControlState");
     lua_classfunction(luaVM, "warpIntoVehicle", "warpPedIntoVehicle");
@@ -2018,6 +2020,36 @@ int CLuaPedDefs::SetPedAnimationProgress(lua_State* luaVM)
     return 1;
 }
 
+int CLuaPedDefs::SetPedAnimationSpeed(lua_State* luaVM)
+{
+    CClientEntity* pEntity;
+    SString        strAnimName;
+    float          fSpeed;
+
+    CScriptArgReader argStream(luaVM);
+    argStream.ReadUserData(pEntity);
+    argStream.ReadString(strAnimName, "");
+    argStream.ReadNumber(fSpeed, 1.0f);
+
+    if (!argStream.HasErrors())
+    {
+        if (!strAnimName.empty() && fSpeed >= 0.0f && fSpeed <= 1.0f)
+        {
+            if (CStaticFunctionDefinitions::SetPedAnimationSpeed(*pEntity, strAnimName, fSpeed))
+            {
+                lua_pushboolean(luaVM, true);
+                return 1;
+            }
+        }
+    }
+    else
+        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
+
+    // Failed
+    lua_pushboolean(luaVM, false);
+    return 1;
+}
+
 int CLuaPedDefs::SetPedMoveAnim(lua_State* luaVM)
 {
     // Verify the argument

Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.h

@@ -69,6 +69,7 @@ class CLuaPedDefs : public CLuaDefs
     LUA_DECLARE(SetPedCanBeKnockedOffBike);
     LUA_DECLARE(SetPedAnimation);
     LUA_DECLARE(SetPedAnimationProgress);
+    LUA_DECLARE(SetPedAnimationSpeed);
     LUA_DECLARE(SetPedMoveAnim);
     LUA_DECLARE(SetPedWeaponSlot);
     LUA_DECLARE(GivePedWeapon);

Client/mods/deathmatch/logic/rpc/CPedRPCs.cpp

@@ -31,6 +31,7 @@ void CPedRPCs::LoadFunctions(void)
     AddHandler(SET_PED_DOING_GANG_DRIVEBY, SetPedDoingGangDriveby, "SetPedDoingGangDriveby");
     AddHandler(SET_PED_ANIMATION, SetPedAnimation, "SetPedAnimation");
     AddHandler(SET_PED_ANIMATION_PROGRESS, SetPedAnimationProgress, "SetPedAnimationProgress");
+    AddHandler(SET_PED_ANIMATION_SPEED, SetPedAnimationSpeed, "SetPedAnimationSpeed");
     AddHandler(SET_PED_ON_FIRE, SetPedOnFire, "SetPedOnFire");
     AddHandler(SET_PED_HEADLESS, SetPedHeadless, "SetPedHeadless");
     AddHandler(SET_PED_FROZEN, SetPedFrozen, "SetPedFrozen");
@@ -317,6 +318,36 @@ void CPedRPCs::SetPedAnimationProgress(CClientEntity* pSource, NetBitStreamInter
     }
 }
 
+void CPedRPCs::SetPedAnimationSpeed(CClientEntity* pSource, NetBitStreamInterface& bitStream)
+{
+    char          szAnimName[64];
+    unsigned char ucAnimSize;
+    float         fSpeed;
+
+    if (bitStream.Read(ucAnimSize))
+    {
+        CClientPed* pPed = m_pPedManager->Get(pSource->GetID(), true);
+        if (pPed)
+        {
+            if (ucAnimSize > 0)
+            {
+                if (bitStream.Read(szAnimName, ucAnimSize))
+                {
+                    szAnimName[ucAnimSize] = 0;
+                    if (bitStream.Read(fSpeed))
+                    {
+                        auto pAnimAssociation = g_pGame->GetAnimManager()->RpAnimBlendClumpGetAssociation(pPed->GetClump(), szAnimName);
+                        if (pAnimAssociation)
+                        {
+                            pAnimAssociation->SetCurrentSpeed(fSpeed);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
 void CPedRPCs::SetPedOnFire(CClientEntity* pSource, NetBitStreamInterface& bitStream)
 {
     bool bIsOnFire;

Client/mods/deathmatch/logic/rpc/CPedRPCs.h

@@ -32,6 +32,7 @@ class CPedRPCs : public CRPCFunctions
     DECLARE_ELEMENT_RPC(SetPedDoingGangDriveby);
     DECLARE_ELEMENT_RPC(SetPedAnimation);
     DECLARE_ELEMENT_RPC(SetPedAnimationProgress);
+    DECLARE_ELEMENT_RPC(SetPedAnimationSpeed);
     DECLARE_ELEMENT_RPC(SetPedOnFire);
     DECLARE_ELEMENT_RPC(SetPedHeadless);
     DECLARE_ELEMENT_RPC(SetPedFrozen);

Client/sdk/game/CAnimBlendAssociation.h

@@ -37,6 +37,7 @@ class CAnimBlendAssociation
     virtual float GetBlendAmount() = 0;
     virtual void  SetBlendAmount(float fAmount) = 0;
     virtual void  SetCurrentProgress(float fProgress) = 0;
+    virtual void  SetCurrentSpeed(float fSpeed) = 0;
     virtual void  SetAnimID(short sAnimID) = 0;
     virtual void  SetAnimGroup(short sAnimGroup) = 0;
     virtual void  SetFlags(short sFlags) = 0;

Server/mods/deathmatch/logic/CPerfStat.RPCPacketUsage.cpp

@@ -52,6 +52,7 @@ ADD_ENUM1(REMOVE_PED_FROM_VEHICLE)
 ADD_ENUM1(SET_PED_DOING_GANG_DRIVEBY)
 ADD_ENUM1(SET_PED_ANIMATION)
 ADD_ENUM1(SET_PED_ANIMATION_PROGRESS)
+ADD_ENUM1(SET_PED_ANIMATION_SPEED)
 ADD_ENUM1(SET_PED_ON_FIRE)
 ADD_ENUM1(SET_PED_HEADLESS)
 ADD_ENUM1(SET_PED_FROZEN)

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -4366,6 +4366,33 @@ bool CStaticFunctionDefinitions::SetPedAnimationProgress(CElement* pElement, con
     return false;
 }
 
+bool CStaticFunctionDefinitions::SetPedAnimationSpeed(CElement* pElement, const char* szAnimName, float fSpeed)
+{
+    assert(pElement);
+    RUN_CHILDREN(SetPedAnimationSpeed(*iter, szAnimName, fSpeed))
+
+        if (IS_PED(pElement))
+        {
+            CPed* pPed = static_cast<CPed*>(pElement);
+            if (pPed->IsSpawned() && szAnimName)
+            {
+                CBitStream BitStream;
+                if (szAnimName)
+                {
+                    unsigned char ucAnimSize = (unsigned char)strlen(szAnimName);
+
+                    BitStream.pBitStream->Write(ucAnimSize);
+                    BitStream.pBitStream->Write(szAnimName, ucAnimSize);
+                    BitStream.pBitStream->Write(fSpeed);
+                }
+                m_pPlayerManager->BroadcastOnlyJoined(CElementRPCPacket(pPed, SET_PED_ANIMATION_SPEED, *BitStream.pBitStream));
+
+                return true;
+            }
+        }
+    return false;
+}
+
 bool CStaticFunctionDefinitions::SetPedOnFire(CElement* pElement, bool bIsOnFire)
 {
     assert(pElement);