Add flags argument

FileEX · FileEX · commit fc3f52eb7743 · 2025-11-19T17:29:29.000+01:00
diff --git a/Client/game_sa/CBuildingSA.cpp b/Client/game_sa/CBuildingSA.cpp
@@ -72,7 +72,7 @@ void CBuildingSA::SetLod(CBuilding* pLod)
     }
 }
 
-void CBuildingSA::SetAnimation(CAnimBlendHierarchySAInterface* animation)
+void CBuildingSA::SetAnimation(CAnimBlendHierarchySAInterface* animation, eAnimationFlags flags)
 {
     if (!m_pInterface || !m_pInterface->m_pRwObject)
         return;
@@ -83,7 +83,7 @@ void CBuildingSA::SetAnimation(CAnimBlendHierarchySAInterface* animation)
         RpAnimBlendClumpInit(clump);
 
     if (animation)
-        pGame->GetAnimManager()->BlendAnimation(clump, animation, ANIMATION_IS_LOOPED, 1.0f);
+        pGame->GetAnimManager()->BlendAnimation(clump, animation, flags, 1.0f);
 }
 
 bool CBuildingSA::SetAnimationSpeed(float speed)
diff --git a/Client/game_sa/CBuildingSA.h b/Client/game_sa/CBuildingSA.h
@@ -27,7 +27,7 @@ class CBuildingSA final : public virtual CBuilding, public virtual CEntitySA
     CBuildingSAInterface* GetBuildingInterface() { return static_cast<CBuildingSAInterface*>(GetInterface()); };
 
     void SetLod(CBuilding* pLod) override;
-    void SetAnimation(class CAnimBlendHierarchySAInterface* animation) override;
+    void SetAnimation(class CAnimBlendHierarchySAInterface* animation, eAnimationFlags flags) override;
     bool SetAnimationSpeed(float speed) override;
 
     void AllocateMatrix();
diff --git a/Client/game_sa/CModelInfoSA.cpp b/Client/game_sa/CModelInfoSA.cpp
@@ -1527,7 +1527,7 @@ void CModelInfoSA::StaticResetModelAnimations()
         if (modelInfo)
         {
             modelInfo->DisableObjectAnimation(false);
-            modelInfo->SetObjectAnimation(nullptr, 0);
+            modelInfo->SetObjectAnimation(nullptr, 0, 0);
         }
 
         CBaseModelInfoSAInterface* modelInfoInterface = modelInfo->GetInterface();
@@ -2233,6 +2233,7 @@ RpClump* __fastcall CClumpModelInfoSAInterface::CreateInstance(CClumpModelInfoSA
     {
         CAnimBlendHierarchySAInterface* anim = nullptr;
         auto* modelInfo = pGame->GetModelInfo(static_cast<CBaseModelInfoSAInterface*>(clumpModelInfo));
+        eAnimationFlags                 flags = ANIMATION_IS_LOOPED;
 
         if (clumpModelInfo->m_nAnimFileIndex != -1)
         {
@@ -2246,12 +2247,15 @@ RpClump* __fastcall CClumpModelInfoSAInterface::CreateInstance(CClumpModelInfoSA
             }
         }
         else if (modelInfo)
+        {
             anim = modelInfo->GetObjectAnimation();
+            flags = modelInfo->GetObjectAnimationFlags();
+        }
 
         if (anim)
         {
             RpAnimBlendClumpInit(clump);
-            pGame->GetAnimManager()->BlendAnimation(clump, anim, ANIMATION_IS_LOOPED, 1.0f);
+            pGame->GetAnimManager()->BlendAnimation(clump, anim, flags, 1.0f);
         }
     }
 
diff --git a/Client/game_sa/CModelInfoSA.h b/Client/game_sa/CModelInfoSA.h
@@ -393,6 +393,7 @@ class CModelInfoSA : public CModelInfo
     CAnimBlendHierarchySAInterface*                                              m_objectAimation{};
     bool                                                                         m_objectAnimationDisabled{false};
     unsigned int                                                                 m_objectAnimationBlockNameHash{0};
+    eAnimationFlags                                                              m_animationFlags{};
 
 public:
     CModelInfoSA();
@@ -534,9 +535,10 @@ class CModelInfoSA : public CModelInfo
     void           RestoreObjectPropertiesGroup();
     static void    RestoreAllObjectsPropertiesGroups();
 
-    void SetObjectAnimation(CAnimBlendHierarchySAInterface* anim, unsigned int blockNameHash) noexcept override { m_objectAimation = anim; InsertModelIntoModifiedAnimList(m_dwModelID); m_objectAnimationBlockNameHash = blockNameHash; }
+    void SetObjectAnimation(CAnimBlendHierarchySAInterface* anim, unsigned int blockNameHash, std::uint16_t flags) noexcept override { m_objectAimation = anim; InsertModelIntoModifiedAnimList(m_dwModelID); m_objectAnimationBlockNameHash = blockNameHash; m_animationFlags = static_cast<eAnimationFlags>(flags); }
     CAnimBlendHierarchySAInterface* GetObjectAnimation() const noexcept override { return m_objectAimation; }
     unsigned int                    GetObjectAnimationBlockNameHash() const noexcept override { return m_objectAnimationBlockNameHash; }
+    eAnimationFlags                 GetObjectAnimationFlags() const noexcept override { return m_animationFlags; }
 
     void DisableObjectAnimation(bool disable) noexcept override { m_objectAnimationDisabled = disable; InsertModelIntoModifiedAnimList(m_dwModelID); }
     bool IsObjectAnimationDisabled() const noexcept override { return m_objectAnimationDisabled; }
diff --git a/Client/game_sa/CObjectSA.cpp b/Client/game_sa/CObjectSA.cpp
@@ -325,7 +325,7 @@ bool CObjectSA::SetOnFire(bool onFire)
     return true;
 }
 
-void CObjectSA::SetAnimation(CAnimBlendHierarchySAInterface* animation)
+void CObjectSA::SetAnimation(CAnimBlendHierarchySAInterface* animation, eAnimationFlags flags)
 {
     if (!m_pInterface || !m_pInterface->m_pRwObject)
         return;
@@ -336,7 +336,7 @@ void CObjectSA::SetAnimation(CAnimBlendHierarchySAInterface* animation)
         RpAnimBlendClumpInit(clump);
 
     if (animation)
-        pGame->GetAnimManager()->BlendAnimation(clump, animation, ANIMATION_IS_LOOPED, 1.0f);
+        pGame->GetAnimManager()->BlendAnimation(clump, animation, flags, 1.0f);
     else
     {
         for (auto assoc = pGame->GetAnimManager()->RpAnimBlendClumpGetFirstAssociation(clump); assoc; assoc = pGame->GetAnimManager()->RpAnimBlendGetNextAssociation(assoc))
diff --git a/Client/game_sa/CObjectSA.h b/Client/game_sa/CObjectSA.h
@@ -156,7 +156,7 @@ class CObjectSA : public virtual CObject, public virtual CPhysicalSA
     bool IsOnFire() override { return GetObjectInterface()->pFire != nullptr; }
     bool SetOnFire(bool onFire) override;
 
-    void SetAnimation(class CAnimBlendHierarchySAInterface* animation) override;
+    void SetAnimation(class CAnimBlendHierarchySAInterface* animation, eAnimationFlags flags) override;
     bool SetAnimationSpeed(float speed) override;
 
 private:
diff --git a/Client/mods/deathmatch/logic/CClientBuilding.cpp b/Client/mods/deathmatch/logic/CClientBuilding.cpp
@@ -226,10 +226,11 @@ float CClientBuilding::GetDistanceFromCentreOfMassToBaseOfModel()
     return m_pBuilding ? m_pBuilding->GetDistanceFromCentreOfMassToBaseOfModel() : 0.0f;
 }
 
-void CClientBuilding::SetAnimation(CAnimBlendHierarchySAInterface* animation, unsigned int blockNameHash)
+void CClientBuilding::SetAnimation(CAnimBlendHierarchySAInterface* animation, unsigned int blockNameHash, std::uint16_t flags)
 {
     m_animation = animation;
     m_animationBlockNameHash = blockNameHash;
+    m_animationFlags = static_cast<eAnimationFlags>(flags);
 
     Recreate();
     RunAnimation();
@@ -254,7 +255,7 @@ void CClientBuilding::RunAnimation()
     if (!m_pBuilding)
         return;
 
-    m_pBuilding->SetAnimation(m_animation);
+    m_pBuilding->SetAnimation(m_animation, m_animationFlags);
     m_pBuilding->SetAnimationSpeed(m_animationSpeed);
     m_animationPlaying = m_animation != nullptr && m_pBuilding->GetRpClump();
 }
diff --git a/Client/mods/deathmatch/logic/CClientBuilding.h b/Client/mods/deathmatch/logic/CClientBuilding.h
@@ -58,7 +58,7 @@ class CClientBuilding : public CClientEntity
 
     float GetDistanceFromCentreOfMassToBaseOfModel();
 
-    void SetAnimation(class CAnimBlendHierarchySAInterface* animation, unsigned int blockNameHash);
+    void SetAnimation(class CAnimBlendHierarchySAInterface* animation, unsigned int blockNameHash, std::uint16_t flags);
     bool SetAnimationSpeed(float speed);
 
     unsigned int GetAnimationBlockNameHash() const noexcept { return m_animationBlockNameHash; }
@@ -92,5 +92,6 @@ class CClientBuilding : public CClientEntity
     unsigned int                    m_animationBlockNameHash{0};
     bool                            m_animationPlaying{false};
     float                           m_animationSpeed{1.0f};
+    eAnimationFlags                 m_animationFlags{};
     bool                            m_animationSpeedUpdated{false};
 };
diff --git a/Client/mods/deathmatch/logic/CClientIFP.cpp b/Client/mods/deathmatch/logic/CClientIFP.cpp
@@ -41,7 +41,7 @@ void CClientIFP::Unlink()
         {
             CModelInfo* modelInfo = g_pGame->GetModelInfo(model);
             if (modelInfo)
-                modelInfo->SetObjectAnimation(nullptr, 0);
+                modelInfo->SetObjectAnimation(nullptr, 0, 0);
 
             m_pManager->GetObjectManager()->RestreamObjects(model);
             m_pManager->GetBuildingManager()->RestreamBuildings(model);
@@ -50,9 +50,9 @@ void CClientIFP::Unlink()
         for (auto entity : m_entitiesUsingThisIFP)
         {
             if (entity->GetType() == eEntityType::ENTITY_TYPE_OBJECT)
-                static_cast<CClientObject*>(entity)->SetAnimation(nullptr, 0);
+                static_cast<CClientObject*>(entity)->SetAnimation(nullptr, 0, 0);
             else if (entity->GetType() == eEntityType::ENTITY_TYPE_BUILDING)
-                static_cast<CClientBuilding*>(entity)->SetAnimation(nullptr, 0);
+                static_cast<CClientBuilding*>(entity)->SetAnimation(nullptr, 0, 0);
         }
     }
 }
diff --git a/Client/mods/deathmatch/logic/CClientObject.cpp b/Client/mods/deathmatch/logic/CClientObject.cpp
@@ -444,10 +444,11 @@ void CClientObject::SetHealth(float fHealth)
     m_fHealth = fHealth;
 }
 
-void CClientObject::SetAnimation(CAnimBlendHierarchySAInterface* animation, unsigned int blockNameHash)
+void CClientObject::SetAnimation(CAnimBlendHierarchySAInterface* animation, unsigned int blockNameHash, std::uint16_t flags)
 {
     m_animation = animation;
     m_animationBlockNameHash = blockNameHash;
+    m_animationFlags = static_cast<eAnimationFlags>(flags);
 
     RunAnimation();
 }
@@ -709,7 +710,7 @@ void CClientObject::RunAnimation()
     if (!m_pObject)
         return;
 
-    m_pObject->SetAnimation(m_animation);
+    m_pObject->SetAnimation(m_animation, m_animationFlags);
     m_pObject->SetAnimationSpeed(m_animationSpeed);
 
     m_animationPlaying = m_animation != nullptr && m_pObject->GetRpClump();
diff --git a/Client/mods/deathmatch/logic/CClientObject.h b/Client/mods/deathmatch/logic/CClientObject.h
@@ -122,7 +122,7 @@ class CClientObject : public CClientStreamElement
     bool IsOnFire() override { return m_pObject ? m_pObject->IsOnFire() : false; }
     bool SetOnFire(bool onFire) override { return m_pObject ? m_pObject->SetOnFire(onFire) : false; };
 
-    void SetAnimation(CAnimBlendHierarchySAInterface* animation, unsigned int blockNameHash);
+    void SetAnimation(CAnimBlendHierarchySAInterface* animation, unsigned int blockNameHash, std::uint16_t flags);
     bool SetAnimationSpeed(float speed);
 
     unsigned int GetAnimationBlockNameHash() const noexcept { return m_animationBlockNameHash; }
@@ -179,6 +179,7 @@ class CClientObject : public CClientStreamElement
 
     CAnimBlendHierarchySAInterface* m_animation{};
     unsigned int                    m_animationBlockNameHash{0};
+    eAnimationFlags                 m_animationFlags{};
 
 public:
     CObject*              m_pObject;
diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp
@@ -2526,7 +2526,7 @@ bool CLuaElementDefs::SetElementOnFire(CClientEntity* entity, bool onFire) noexc
     return entity->SetOnFire(onFire);
 }
 
-bool CLuaElementDefs::SetElementAnimation(CClientEntity* entity, std::optional<std::variant<CClientIFP*, bool>> ifpOrNil, std::optional<std::string> animationName)
+bool CLuaElementDefs::SetElementAnimation(CClientEntity* entity, std::optional<std::variant<CClientIFP*, bool>> ifpOrNil, std::optional<std::string> animationName, std::optional<std::uint16_t> flags)
 {
     if (!IS_OBJECT(entity) && !IS_BUILDING(entity))
         return false;
@@ -2536,12 +2536,12 @@ bool CLuaElementDefs::SetElementAnimation(CClientEntity* entity, std::optional<s
         return IS_OBJECT(ent) ? static_cast<CClientObject*>(ent)->GetAnimationBlockNameHash() : static_cast<CClientBuilding*>(ent)->GetAnimationBlockNameHash();
     };
 
-    auto setEntityAnimation = [&](CClientEntity* ent, CAnimBlendHierarchySAInterface* anim, std::uint32_t blockHash)
+    auto setEntityAnimation = [&](CClientEntity* ent, CAnimBlendHierarchySAInterface* anim, std::uint32_t blockHash, std::uint16_t flags)
     {
         if (IS_OBJECT(ent))
-            static_cast<CClientObject*>(ent)->SetAnimation(anim, blockHash);
+            static_cast<CClientObject*>(ent)->SetAnimation(anim, blockHash, flags);
         else
-            static_cast<CClientBuilding*>(ent)->SetAnimation(anim, blockHash);
+            static_cast<CClientBuilding*>(ent)->SetAnimation(anim, blockHash, flags);
     };
 
     // Clean up old IFP association before applying a new animation
@@ -2554,7 +2554,7 @@ bool CLuaElementDefs::SetElementAnimation(CClientEntity* entity, std::optional<s
 
     if (!ifpOrNil.has_value() || std::holds_alternative<bool>(ifpOrNil.value()))
     {
-        setEntityAnimation(entity, nullptr, 0);
+        setEntityAnimation(entity, nullptr, 0, 0);
         return true;
     }
 
@@ -2563,7 +2563,7 @@ bool CLuaElementDefs::SetElementAnimation(CClientEntity* entity, std::optional<s
     if (!animHierarchy)
         throw std::invalid_argument("Invalid animation name");
 
-    setEntityAnimation(entity, animHierarchy, ifp->GetBlockNameHash());
+    setEntityAnimation(entity, animHierarchy, ifp->GetBlockNameHash(), flags.value_or(eAnimationFlags::ANIMATION_IS_LOOPED));
     ifp->InsertEntityUsingThisIFP(entity);
 
     return true;
diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.h
@@ -103,6 +103,6 @@ class CLuaElementDefs : public CLuaDefs
     static bool SetElementLighting(CClientEntity* entity, float lighting);
     static bool SetElementOnFire(CClientEntity* entity, bool onFire) noexcept;
 
-    static bool SetElementAnimation(CClientEntity* entity, std::optional<std::variant<CClientIFP*, bool>> ifpOrNil, std::optional<std::string> animationName);
+    static bool SetElementAnimation(CClientEntity* entity, std::optional<std::variant<CClientIFP*, bool>> ifpOrNil, std::optional<std::string> animationName, std::optional<std::uint16_t> flags);
     static bool SetElementAnimationSpeed(CClientEntity* entity, float speed);
 };
diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp
@@ -2625,7 +2625,7 @@ void CLuaEngineDefs::EngineRestream(std::optional<RestreamOption> option)
     g_pClientGame->Restream(option);
 }
 
-bool CLuaEngineDefs::EngineSetModelAnimation(std::uint16_t modelId, std::optional<std::variant<CClientIFP*, bool>> ifpOrNil, std::optional<std::string> animationName)
+bool CLuaEngineDefs::EngineSetModelAnimation(std::uint16_t modelId, std::optional<std::variant<CClientIFP*, bool>> ifpOrNil, std::optional<std::string> animationName, std::optional<std::uint16_t> flags)
 {
     if (!CClientObjectManager::IsValidModel(modelId) && !CClientBuildingManager::IsValidModel(modelId))
         throw std::invalid_argument("Invalid model ID");
@@ -2645,7 +2645,7 @@ bool CLuaEngineDefs::EngineSetModelAnimation(std::uint16_t modelId, std::optiona
     if (!ifpOrNil.has_value() || std::holds_alternative<bool>(ifpOrNil.value()))
     {
         modelInfo->DisableObjectAnimation(true);
-        modelInfo->SetObjectAnimation(nullptr, 0);
+        modelInfo->SetObjectAnimation(nullptr, 0, 0);
     }
     else if (std::holds_alternative<CClientIFP*>(ifpOrNil.value()))
     {
@@ -2655,7 +2655,7 @@ bool CLuaEngineDefs::EngineSetModelAnimation(std::uint16_t modelId, std::optiona
             throw std::invalid_argument("Invalid animation name");
 
         ifp->InsertModelUsingThisIFP(modelId);
-        modelInfo->SetObjectAnimation(animHierarchy, ifp->GetBlockNameHash());
+        modelInfo->SetObjectAnimation(animHierarchy, ifp->GetBlockNameHash(), flags.value_or(eAnimationFlags::ANIMATION_IS_LOOPED));
     }
 
     m_pManager->GetObjectManager()->RestreamObjects(modelId);
@@ -2681,7 +2681,7 @@ void CLuaEngineDefs::EngineRestoreModelAnimation(std::uint16_t modelId)
             ifp->RemoveModelUsingThisIFP(modelId);
     }
 
-    modelInfo->SetObjectAnimation(nullptr, 0);
+    modelInfo->SetObjectAnimation(nullptr, 0, 0);
     
     m_pManager->GetObjectManager()->RestreamObjects(modelId);
     m_pManager->GetBuildingManager()->RestreamBuildings(modelId);
diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.h
@@ -99,7 +99,7 @@ class CLuaEngineDefs : public CLuaDefs
     static bool EngineRestreamModel(std::uint16_t modelId);
     static void EngineRestream(std::optional<RestreamOption> option);
 
-    static bool EngineSetModelAnimation(std::uint16_t modelId, std::optional<std::variant<CClientIFP*, bool>> ifpOrNil, std::optional<std::string> animationName);
+    static bool EngineSetModelAnimation(std::uint16_t modelId, std::optional<std::variant<CClientIFP*, bool>> ifpOrNil, std::optional<std::string> animationName, std::optional<std::uint16_t> flags);
     static void EngineRestoreModelAnimation(std::uint16_t modelId);
 
 private:
diff --git a/Client/sdk/game/CBuilding.h b/Client/sdk/game/CBuilding.h
@@ -22,6 +22,6 @@ class CBuilding : public virtual CEntity
 
     virtual CBuildingSAInterface* GetBuildingInterface() = 0;
     virtual void                  SetLod(CBuilding* pLod) = 0;
-    virtual void                  SetAnimation(class CAnimBlendHierarchySAInterface* animation) = 0;
+    virtual void                  SetAnimation(class CAnimBlendHierarchySAInterface* animation, enum eAnimationFlags flags) = 0;
     virtual bool                  SetAnimationSpeed(float speed) = 0;
 };
diff --git a/Client/sdk/game/CModelInfo.h b/Client/sdk/game/CModelInfo.h
@@ -25,6 +25,7 @@ class CColModel;
 class CPedModelInfo;
 struct RpClump;
 struct RwObject;
+enum eAnimationFlags;
 
 class CBoundingBox
 {
@@ -254,9 +255,10 @@ class CModelInfo
     virtual unsigned short GetObjectPropertiesGroup() = 0;
     virtual void           RestoreObjectPropertiesGroup() = 0;
 
-    virtual void SetObjectAnimation(CAnimBlendHierarchySAInterface* anim, unsigned int blockNameHash) noexcept = 0;
+    virtual void SetObjectAnimation(CAnimBlendHierarchySAInterface* anim, unsigned int blockNameHash, std::uint16_t flags) noexcept = 0;
     virtual CAnimBlendHierarchySAInterface* GetObjectAnimation() const noexcept = 0;
     virtual unsigned int                    GetObjectAnimationBlockNameHash() const noexcept = 0;
+    virtual eAnimationFlags                 GetObjectAnimationFlags() const noexcept = 0;
 
     virtual void DisableObjectAnimation(bool disable) noexcept = 0;
     virtual bool IsObjectAnimationDisabled() const noexcept = 0;
diff --git a/Client/sdk/game/CObject.h b/Client/sdk/game/CObject.h
@@ -42,6 +42,6 @@ class CObject : public virtual CPhysical
     virtual CVector* GetScale() = 0;
     virtual void     ResetScale() = 0;
 
-    virtual void SetAnimation(class CAnimBlendHierarchySAInterface* animation) = 0;
+    virtual void SetAnimation(class CAnimBlendHierarchySAInterface* animation, enum eAnimationFlags flags) = 0;
     virtual bool SetAnimationSpeed(float speed) = 0;
 };

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ void CBuildingSA::SetLod(CBuilding* pLod)`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
`75`		`-void CBuildingSA::SetAnimation(CAnimBlendHierarchySAInterface* animation)`
	`75`	`+void CBuildingSA::SetAnimation(CAnimBlendHierarchySAInterface* animation, eAnimationFlags flags)`
`76`	`76`	`{`
`77`	`77`	`if (!m_pInterface \|\| !m_pInterface->m_pRwObject)`
`78`	`78`	`return;`
`@@ -83,7 +83,7 @@ void CBuildingSA::SetAnimation(CAnimBlendHierarchySAInterface* animation)`
`83`	`83`	`RpAnimBlendClumpInit(clump);`
`84`	`84`
`85`	`85`	`if (animation)`
`86`		`- pGame->GetAnimManager()->BlendAnimation(clump, animation, ANIMATION_IS_LOOPED, 1.0f);`
	`86`	`+ pGame->GetAnimManager()->BlendAnimation(clump, animation, flags, 1.0f);`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`bool CBuildingSA::SetAnimationSpeed(float speed)`
Original file line number	Diff line number	Diff line change
`@@ -1527,7 +1527,7 @@ void CModelInfoSA::StaticResetModelAnimations()`
`1527`	`1527`	`if (modelInfo)`
`1528`	`1528`	`{`
`1529`	`1529`	`modelInfo->DisableObjectAnimation(false);`
`1530`		`- modelInfo->SetObjectAnimation(nullptr, 0);`
	`1530`	`+ modelInfo->SetObjectAnimation(nullptr, 0, 0);`
`1531`	`1531`	`}`
`1532`	`1532`
`1533`	`1533`	`CBaseModelInfoSAInterface* modelInfoInterface = modelInfo->GetInterface();`
`@@ -2233,6 +2233,7 @@ RpClump* __fastcall CClumpModelInfoSAInterface::CreateInstance(CClumpModelInfoSA`
`2233`	`2233`	`{`
`2234`	`2234`	`CAnimBlendHierarchySAInterface* anim = nullptr;`
`2235`	`2235`	`auto* modelInfo = pGame->GetModelInfo(static_cast<CBaseModelInfoSAInterface*>(clumpModelInfo));`
	`2236`	`+ eAnimationFlags flags = ANIMATION_IS_LOOPED;`
`2236`	`2237`
`2237`	`2238`	`if (clumpModelInfo->m_nAnimFileIndex != -1)`
`2238`	`2239`	`{`
`@@ -2246,12 +2247,15 @@ RpClump* __fastcall CClumpModelInfoSAInterface::CreateInstance(CClumpModelInfoSA`
`2246`	`2247`	`}`
`2247`	`2248`	`}`
`2248`	`2249`	`else if (modelInfo)`
	`2250`	`+ {`
`2249`	`2251`	`anim = modelInfo->GetObjectAnimation();`
	`2252`	`+ flags = modelInfo->GetObjectAnimationFlags();`
	`2253`	`+ }`
`2250`	`2254`
`2251`	`2255`	`if (anim)`
`2252`	`2256`	`{`
`2253`	`2257`	`RpAnimBlendClumpInit(clump);`
`2254`		`- pGame->GetAnimManager()->BlendAnimation(clump, anim, ANIMATION_IS_LOOPED, 1.0f);`
	`2258`	`+ pGame->GetAnimManager()->BlendAnimation(clump, anim, flags, 1.0f);`
`2255`	`2259`	`}`
`2256`	`2260`	`}`
`2257`	`2261`
Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ bool CObjectSA::SetOnFire(bool onFire)`
`325`	`325`	`return true;`
`326`	`326`	`}`
`327`	`327`
`328`		`-void CObjectSA::SetAnimation(CAnimBlendHierarchySAInterface* animation)`
	`328`	`+void CObjectSA::SetAnimation(CAnimBlendHierarchySAInterface* animation, eAnimationFlags flags)`
`329`	`329`	`{`
`330`	`330`	`if (!m_pInterface \|\| !m_pInterface->m_pRwObject)`
`331`	`331`	`return;`
`@@ -336,7 +336,7 @@ void CObjectSA::SetAnimation(CAnimBlendHierarchySAInterface* animation)`
`336`	`336`	`RpAnimBlendClumpInit(clump);`
`337`	`337`
`338`	`338`	`if (animation)`
`339`		`- pGame->GetAnimManager()->BlendAnimation(clump, animation, ANIMATION_IS_LOOPED, 1.0f);`
	`339`	`+ pGame->GetAnimManager()->BlendAnimation(clump, animation, flags, 1.0f);`
`340`	`340`	`else`
`341`	`341`	`{`
`342`	`342`	`for (auto assoc = pGame->GetAnimManager()->RpAnimBlendClumpGetFirstAssociation(clump); assoc; assoc = pGame->GetAnimManager()->RpAnimBlendGetNextAssociation(assoc))`
Original file line number	Diff line number	Diff line change
`@@ -226,10 +226,11 @@ float CClientBuilding::GetDistanceFromCentreOfMassToBaseOfModel()`
`226`	`226`	`return m_pBuilding ? m_pBuilding->GetDistanceFromCentreOfMassToBaseOfModel() : 0.0f;`
`227`	`227`	`}`
`228`	`228`
`229`		`-void CClientBuilding::SetAnimation(CAnimBlendHierarchySAInterface* animation, unsigned int blockNameHash)`
	`229`	`+void CClientBuilding::SetAnimation(CAnimBlendHierarchySAInterface* animation, unsigned int blockNameHash, std::uint16_t flags)`
`230`	`230`	`{`
`231`	`231`	`m_animation = animation;`
`232`	`232`	`m_animationBlockNameHash = blockNameHash;`
	`233`	`+ m_animationFlags = static_cast<eAnimationFlags>(flags);`
`233`	`234`
`234`	`235`	`Recreate();`
`235`	`236`	`RunAnimation();`
`@@ -254,7 +255,7 @@ void CClientBuilding::RunAnimation()`
`254`	`255`	`if (!m_pBuilding)`
`255`	`256`	`return;`
`256`	`257`
`257`		`- m_pBuilding->SetAnimation(m_animation);`
	`258`	`+ m_pBuilding->SetAnimation(m_animation, m_animationFlags);`
`258`	`259`	`m_pBuilding->SetAnimationSpeed(m_animationSpeed);`
`259`	`260`	`m_animationPlaying = m_animation != nullptr && m_pBuilding->GetRpClump();`
`260`	`261`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ void CClientIFP::Unlink()`
`41`	`41`	`{`
`42`	`42`	`CModelInfo* modelInfo = g_pGame->GetModelInfo(model);`
`43`	`43`	`if (modelInfo)`
`44`		`- modelInfo->SetObjectAnimation(nullptr, 0);`
	`44`	`+ modelInfo->SetObjectAnimation(nullptr, 0, 0);`
`45`	`45`
`46`	`46`	`m_pManager->GetObjectManager()->RestreamObjects(model);`
`47`	`47`	`m_pManager->GetBuildingManager()->RestreamBuildings(model);`
`@@ -50,9 +50,9 @@ void CClientIFP::Unlink()`
`50`	`50`	`for (auto entity : m_entitiesUsingThisIFP)`
`51`	`51`	`{`
`52`	`52`	`if (entity->GetType() == eEntityType::ENTITY_TYPE_OBJECT)`
`53`		`- static_cast<CClientObject*>(entity)->SetAnimation(nullptr, 0);`
	`53`	`+ static_cast<CClientObject*>(entity)->SetAnimation(nullptr, 0, 0);`
`54`	`54`	`else if (entity->GetType() == eEntityType::ENTITY_TYPE_BUILDING)`
`55`		`- static_cast<CClientBuilding*>(entity)->SetAnimation(nullptr, 0);`
	`55`	`+ static_cast<CClientBuilding*>(entity)->SetAnimation(nullptr, 0, 0);`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -444,10 +444,11 @@ void CClientObject::SetHealth(float fHealth)`
`444`	`444`	`m_fHealth = fHealth;`
`445`	`445`	`}`
`446`	`446`
`447`		`-void CClientObject::SetAnimation(CAnimBlendHierarchySAInterface* animation, unsigned int blockNameHash)`
	`447`	`+void CClientObject::SetAnimation(CAnimBlendHierarchySAInterface* animation, unsigned int blockNameHash, std::uint16_t flags)`
`448`	`448`	`{`
`449`	`449`	`m_animation = animation;`
`450`	`450`	`m_animationBlockNameHash = blockNameHash;`
	`451`	`+ m_animationFlags = static_cast<eAnimationFlags>(flags);`
`451`	`452`
`452`	`453`	`RunAnimation();`
`453`	`454`	`}`
`@@ -709,7 +710,7 @@ void CClientObject::RunAnimation()`
`709`	`710`	`if (!m_pObject)`
`710`	`711`	`return;`
`711`	`712`
`712`		`- m_pObject->SetAnimation(m_animation);`
	`713`	`+ m_pObject->SetAnimation(m_animation, m_animationFlags);`
`713`	`714`	`m_pObject->SetAnimationSpeed(m_animationSpeed);`
`714`	`715`
`715`	`716`	`m_animationPlaying = m_animation != nullptr && m_pObject->GetRpClump();`