Improved code design for CAnimBlendStaticAssociation

codenulls · codenulls · commit a5ddb6ea9307 · 2018-04-01T11:22:09.000+05:00
diff --git a/Client/game_sa/CAnimBlendStaticAssociationSA.cpp b/Client/game_sa/CAnimBlendStaticAssociationSA.cpp
@@ -12,7 +12,15 @@
 
 #include "StdInc.h"
 
-CAnimBlendHierarchy * CAnimBlendStaticAssociationSA::GetAnimHierachy ( void )
+void CAnimBlendStaticAssociationSA::Initialize ( RpClump * pClump, CAnimBlendHierarchySAInterface * pAnimBlendHierarchyInterface )
 {
-    return NULL;
+    DWORD dwThis = ( DWORD ) m_pInterface;
+    DWORD dwFunc = FUNC_CAnimBlendStaticAssociation_Initialize;
+    _asm
+    {
+        push    pAnimBlendHierarchyInterface
+        push    pClump
+        mov     ecx, dwThis
+        call    dwFunc
+    }
 }
diff --git a/Client/game_sa/CAnimBlendStaticAssociationSA.h b/Client/game_sa/CAnimBlendStaticAssociationSA.h
@@ -18,6 +18,8 @@
 #include <game/CAnimBlendStaticAssociation.h>
 #include "Common.h"
 
+#define FUNC_CAnimBlendStaticAssociation_Initialize 0x4CEC20
+
 class CAnimBlendAssocGroupSA;
 class CAnimBlendHierarchySAInterface;
 class CAnimBlendHierarchy;
@@ -39,8 +41,17 @@ class CAnimBlendStaticAssociationSA : public CAnimBlendStaticAssociation
 {
 public:
                                         CAnimBlendStaticAssociationSA       ( CAnimBlendStaticAssociationSAInterface * pInterface )     { m_pInterface = pInterface; }
-
-    CAnimBlendHierarchy *               GetAnimHierachy                     ( void );
+    void                                Initialize                          ( RpClump * pClump, CAnimBlendHierarchySAInterface * pAnimBlendHierarchyInterface );
+    void                                SetNumBlendNodes                    ( unsigned short nNumBlendNodes ) { m_pInterface->nNumBlendNodes = nNumBlendNodes; };
+    void                                SetAnimID                           ( short sAnimID ) { m_pInterface->sAnimID = sAnimID; }
+    void                                SetAnimGroup                        ( short sAnimGroup ) { m_pInterface->sAnimGroup = sAnimGroup; }
+    void                                SetFlags                            ( short sFlags ) { m_pInterface->sFlags = sFlags; }
+
+    unsigned short                      GetNumBlendNodes                    ( void ) { return m_pInterface->nNumBlendNodes; };
+    short                               GetAnimID                           ( void ) { return m_pInterface->sAnimID; }
+    short                               GetAnimGroup                        ( void ) { return m_pInterface->sAnimGroup; }
+    short                               GetFlags                            ( void ) { return m_pInterface->sFlags; }
+    CAnimBlendHierarchySAInterface *    GetAnimHierachyInterface            ( void ) { return m_pInterface->pAnimHeirarchy; }
 
 protected:
     CAnimBlendStaticAssociationSAInterface *   m_pInterface;
diff --git a/Client/game_sa/CAnimManagerSA.cpp b/Client/game_sa/CAnimManagerSA.cpp
@@ -256,7 +256,7 @@ CAnimBlendAssociation * CAnimManagerSA::CreateAnimAssociation ( AssocGroupId ani
 }
 
 
-CAnimBlendStaticAssociationSAInterface * CAnimManagerSA::GetAnimStaticAssociation ( AssocGroupId animGroup, AnimationId animID )
+CAnimManagerSA::StaticAssocIntface_type CAnimManagerSA::GetAnimStaticAssociation ( AssocGroupId animGroup, AnimationId animID )
 {
     CAnimBlendStaticAssociationSAInterface * pInterface = nullptr;
     DWORD dwFunc = FUNC_CAnimManager_GetAnimAssociation;
@@ -268,7 +268,7 @@ CAnimBlendStaticAssociationSAInterface * CAnimManagerSA::GetAnimStaticAssociatio
         mov     pInterface, eax
         add     esp, 0x8
     }
-    return pInterface;
+    return std::make_unique < CAnimBlendStaticAssociationSA > ( pInterface );
 }
 
 
@@ -798,6 +798,11 @@ CAnimBlendHierarchy * CAnimManagerSA::GetAnimBlendHierarchy ( CAnimBlendHierarch
     return NULL;
 }
 
+CAnimManagerSA::StaticAssocIntface_type CAnimManagerSA::GetAnimStaticAssociation ( CAnimBlendStaticAssociationSAInterface * pInterface )
+{
+    return std::make_unique < CAnimBlendStaticAssociationSA > ( pInterface );
+}
+
 std::unique_ptr < CAnimBlendHierarchy > CAnimManagerSA::GetCustomAnimBlendHierarchy ( CAnimBlendHierarchySAInterface * pInterface )
 {
     return std::make_unique < CAnimBlendHierarchySA > ( pInterface );
diff --git a/Client/game_sa/CAnimManagerSA.h b/Client/game_sa/CAnimManagerSA.h
@@ -81,7 +81,7 @@ class CAnimManagerSAInterface
 
 class CAnimManagerSA : public CAnimManager
 {
-    typedef CAnimBlendStaticAssociationSAInterface * StaticAssocIntface_type;
+    typedef std::unique_ptr < CAnimBlendStaticAssociation > StaticAssocIntface_type;
 
 public:
                                 CAnimManagerSA                          ( void );
@@ -154,6 +154,8 @@ class CAnimManagerSA : public CAnimManager
     CAnimBlock *                GetAnimBlock                            ( CAnimBlockSAInterface * pInterface );
     CAnimBlendHierarchy *       GetAnimBlendHierarchy                   ( CAnimBlendHierarchySAInterface * pInterface );
 
+    StaticAssocIntface_type     GetAnimStaticAssociation                ( CAnimBlendStaticAssociationSAInterface * pInterface );
+
     // MTA members, but use this strictly for custom animations only
     std::unique_ptr < CAnimBlendHierarchy > GetCustomAnimBlendHierarchy ( CAnimBlendHierarchySAInterface * pInterface );
     std::unique_ptr < CAnimBlendSequence >  GetCustomAnimBlendSequence  ( CAnimBlendSequenceSAInterface * pInterface );
diff --git a/Client/mods/deathmatch/logic/CClientGame.cpp b/Client/mods/deathmatch/logic/CClientGame.cpp
@@ -4027,57 +4027,42 @@ CAnimBlendAssociationSAInterface * CClientGame::AddAnimationAndSyncHandler ( RpC
 }
 
 
-typedef void (__thiscall* hCAnimBlendStaticAssociation_Init)
-(
-    CAnimBlendStaticAssociationSAInterface * pThis,
-    RpClump * Clump,
-    CAnimBlendHierarchySAInterface * pAnimBlendHierarchy
-);
-
-
-bool CClientGame::AssocGroupCopyAnimationHandler ( CAnimBlendStaticAssociationSAInterface * pOutAnimStaticAssoc, CAnimBlendAssociationSAInterface * pAnimAssoc, RpClump * pClump, CAnimBlendAssocGroupSAInterface * pAnimAssocGroup, AnimationId animID )
+bool CClientGame::AssocGroupCopyAnimationHandler ( CAnimBlendStaticAssociationSAInterface * pOutAnimStaticAssocInterface, CAnimBlendAssociationSAInterface * pAnimAssoc, RpClump * pClump, CAnimBlendAssocGroupSAInterface * pAnimAssocGroup, AnimationId animID )
 {
-    auto CAnimBlendStaticAssociation_Init = (hCAnimBlendStaticAssociation_Init)0x4CEC20;
     bool isCustomAnimationToPlay = false;
-
     CAnimManager * pAnimationManager = g_pGame->GetAnimManager();
     auto pOriginalAnimStaticAssoc = pAnimationManager->GetAnimStaticAssociation ( pAnimAssocGroup->groupID, animID );
-
+    auto pOriginalAnimHierarchyInterface = pOriginalAnimStaticAssoc->GetAnimHierachyInterface ( );
+    auto pOutAnimStaticAssoc = pAnimationManager->GetAnimStaticAssociation ( pOutAnimStaticAssocInterface );
     CClientPed * pClientPed =  GetClientPedByClump ( *pClump ); 
     if ( pClientPed != nullptr )
     {
-        auto pReplacedAnimation = pClientPed->GetReplacedAnimation ( pOriginalAnimStaticAssoc->pAnimHeirarchy );
+        auto pReplacedAnimation = pClientPed->GetReplacedAnimation ( pOriginalAnimHierarchyInterface );
         if ( pReplacedAnimation != nullptr )
         {   
             std::shared_ptr < CIFPAnimations > pIFPAnimations = pReplacedAnimation->pIFP->GetIFPAnimationsPointer ();
             InsertAnimationAssociationToMap ( pAnimAssoc, pIFPAnimations );
                
             // Play our custom animation instead of default
-            CAnimBlendStaticAssociation_Init ( pOutAnimStaticAssoc, pClump, pReplacedAnimation->pAnimationHierarchy );
+            pOutAnimStaticAssoc->Initialize ( pClump, pReplacedAnimation->pAnimationHierarchy );
             isCustomAnimationToPlay = true;
         }
     }
 
     if ( !isCustomAnimationToPlay )
     {
         // Play default internal animation
-        CAnimBlendStaticAssociation_Init ( pOutAnimStaticAssoc, pClump, pOriginalAnimStaticAssoc->pAnimHeirarchy );
+        pOutAnimStaticAssoc->Initialize ( pClump, pOriginalAnimHierarchyInterface );
     }
 
-    pOutAnimStaticAssoc->sAnimGroup = static_cast < short > ( pAnimAssocGroup->groupID );
-    pOutAnimStaticAssoc->sAnimID = static_cast < short > ( animID );
-
-    // Total bones in clump. GTA SA is using 32 bones for peds/players
-    pOutAnimStaticAssoc->nNumBlendNodes = pOriginalAnimStaticAssoc->nNumBlendNodes;
-    pOutAnimStaticAssoc->sFlags = pOriginalAnimStaticAssoc->sFlags;
+    CopyStaticAssociationProperties ( pOutAnimStaticAssoc, pOriginalAnimStaticAssoc );
     return isCustomAnimationToPlay;
 }
 
 
 bool CClientGame::BlendAnimationHierarchyHandler ( CAnimBlendAssociationSAInterface * pAnimAssoc, CAnimBlendHierarchySAInterface ** pOutAnimHierarchy, int * pFlags, RpClump * pClump )
 {   
     bool isCustomAnimationToPlay = false;
-
     CAnimManager * pAnimationManager = g_pGame->GetAnimManager();
     CClientPed * pClientPed =  GetClientPedByClump ( *pClump ); 
     if ( pClientPed != nullptr )
@@ -6845,12 +6830,25 @@ void CClientGame::RestreamModel ( unsigned short usModel )
 
 }
 
+
+void CClientGame::CopyStaticAssociationProperties ( std::unique_ptr < CAnimBlendStaticAssociation > & pOutAnimStaticAssoc, std::unique_ptr < CAnimBlendStaticAssociation > & pOriginalAnimStaticAssoc )
+{
+    pOutAnimStaticAssoc->SetAnimGroup ( pOriginalAnimStaticAssoc->GetAnimGroup ( ) );
+    pOutAnimStaticAssoc->SetAnimID ( pOriginalAnimStaticAssoc->GetAnimID ( ) );
+
+    // Total bones in clump. GTA SA is using 32 bones for peds/players
+    pOutAnimStaticAssoc->SetNumBlendNodes ( pOriginalAnimStaticAssoc->GetNumBlendNodes ( ) );
+    pOutAnimStaticAssoc->SetFlags ( pOriginalAnimStaticAssoc->GetFlags ( ) );
+}
+
+
 void CClientGame::InsertIFPPointerToMap ( const unsigned int u32BlockNameHash, const std::shared_ptr < CClientIFP > & pIFP ) 
 { 
     std::lock_guard < std::mutex > mutexGuardedLock ( m_MutexOfIfpPointersMap );
     m_mapOfIfpPointers [ u32BlockNameHash ] = pIFP; 
 }
 
+
 std::shared_ptr < CClientIFP > CClientGame::GetIFPPointerFromMap ( const unsigned int u32BlockNameHash )
 {
     std::lock_guard < std::mutex > mutexGuardedLock ( m_MutexOfIfpPointersMap );
@@ -6862,6 +6860,7 @@ std::shared_ptr < CClientIFP > CClientGame::GetIFPPointerFromMap ( const unsigne
     return nullptr;
 }
 
+
 void CClientGame::RemoveIFPPointerFromMap ( const unsigned int u32BlockNameHash ) 
 { 
     std::lock_guard < std::mutex > mutexGuardedLock ( m_MutexOfIfpPointersMap );
@@ -6875,12 +6874,14 @@ void  CClientGame::InsertPedPointerToSet ( CClientPed * pPed )
     m_setOfPedPointers.insert ( pPed );
 }
 
+
 void  CClientGame::RemovePedPointerFromSet ( CClientPed * pPed ) 
 { 
     std::lock_guard < std::mutex > mutexGuardedLock ( m_MutexOfPedPointersSet );
     m_setOfPedPointers.erase ( pPed ); 
 }
 
+
 CClientPed * CClientGame::GetClientPedByClump ( const RpClump & Clump )
 {
     std::lock_guard < std::mutex > mutexGuardedLock ( m_MutexOfPedPointersSet );
@@ -6902,6 +6903,7 @@ CClientPed * CClientGame::GetClientPedByClump ( const RpClump & Clump )
     return nullptr;
 }
 
+
 void CClientGame::OnClientIFPUnload ( const std::shared_ptr < CClientIFP > & IFP )
 {   
     std::lock_guard < std::mutex > mutexGuardedLock ( m_MutexOfPedPointersSet );
@@ -6931,12 +6933,14 @@ void CClientGame::OnClientIFPUnload ( const std::shared_ptr < CClientIFP > & IFP
     }
 }
 
+
 void CClientGame::InsertAnimationAssociationToMap ( CAnimBlendAssociationSAInterface * pAnimAssociation, const std::shared_ptr < CIFPAnimations > & pIFPAnimations )
 {
     std::lock_guard < std::mutex > mutexGuardedLock ( m_MutexOfAnimationAssociationsMap );
     m_mapOfCustomAnimationAssociations [ pAnimAssociation ] = pIFPAnimations;
 }
 
+
 void CClientGame::RemoveAnimationAssociationFromMap ( CAnimBlendAssociationSAInterface * pAnimAssociation )
 {
     std::lock_guard < std::mutex > mutexGuardedLock ( m_MutexOfAnimationAssociationsMap );
diff --git a/Client/mods/deathmatch/logic/CClientGame.h b/Client/mods/deathmatch/logic/CClientGame.h
@@ -593,6 +593,7 @@ class CClientGame
     void                                      SetFileCacheRoot                ( void );
     const char*                               GetFileCacheRoot                ( void )                                    { return m_strFileCacheRoot; }
 
+    void                                      CopyStaticAssociationProperties ( std::unique_ptr < CAnimBlendStaticAssociation > & pOutAnimStaticAssoc, std::unique_ptr < CAnimBlendStaticAssociation > & pOriginalAnimStaticAssoc );
     void                                      InsertIFPPointerToMap           ( const unsigned int u32BlockNameHash, const std::shared_ptr < CClientIFP > & pIFP );
     void                                      RemoveIFPPointerFromMap         ( const unsigned int u32BlockNameHash );
     std::shared_ptr < CClientIFP >            GetIFPPointerFromMap            ( const unsigned int u32BlockNameHash );
diff --git a/Client/sdk/game/CAnimBlendStaticAssociation.h b/Client/sdk/game/CAnimBlendStaticAssociation.h
@@ -12,9 +12,23 @@
 #ifndef __CAnimBlendStaticAssociation_H
 #define __CAnimBlendStaticAssociation_H
 
+struct RpClump;
+class CAnimBlendHierarchySAInterface;
+
 class CAnimBlendStaticAssociation
 {
 public:
+    virtual void                                Initialize                          ( RpClump * pClump, CAnimBlendHierarchySAInterface * pAnimBlendHierarchyInterface ) = 0;
+    virtual void                                SetNumBlendNodes                    ( unsigned short nNumBlendNodes ) = 0;
+    virtual void                                SetAnimID                           ( short sAnimID ) = 0;
+    virtual void                                SetAnimGroup                        ( short sAnimGroup ) = 0;
+    virtual void                                SetFlags                            ( short sFlags ) = 0;
+
+    virtual unsigned short                      GetNumBlendNodes                    ( void ) = 0;
+    virtual short                               GetAnimID                           ( void ) = 0;
+    virtual short                               GetAnimGroup                        ( void ) = 0;
+    virtual short                               GetFlags                            ( void ) = 0;
+    virtual CAnimBlendHierarchySAInterface *    GetAnimHierachyInterface            ( void ) = 0;
 };
 
 #endif
diff --git a/Client/sdk/game/CAnimManager.h b/Client/sdk/game/CAnimManager.h
@@ -28,6 +28,7 @@ class CAnimBlendHierarchy;
 class CAnimBlendSequence;
 class CAnimBlock;
 class CAnimBlendAssociation;
+class CAnimBlendStaticAssociation;
 class CAnimBlendStaticAssociationSAInterface;
 class CClientPed;
 struct RpClump;
@@ -46,7 +47,7 @@ class CAnimManager
 
     friend class CAnimBlendAssociation;
 public:
-    typedef CAnimBlendStaticAssociationSAInterface * StaticAssocIntface_type;
+    typedef std::unique_ptr < CAnimBlendStaticAssociation > StaticAssocIntface_type;
 
     virtual void                        Initialize                              ( void ) = 0;
     virtual void                        Shutdown                                ( void ) = 0;
@@ -116,6 +117,8 @@ class CAnimManager
     virtual CAnimBlock *                GetAnimBlock                            ( CAnimBlockSAInterface * pInterface ) = 0;
     virtual CAnimBlendHierarchy *       GetAnimBlendHierarchy                   ( CAnimBlendHierarchySAInterface * pInterface ) = 0;
 
+    virtual StaticAssocIntface_type     GetAnimStaticAssociation                ( CAnimBlendStaticAssociationSAInterface * pInterface ) = 0;
+
     // MTA members, but use this strictly for custom animations only
     virtual std::unique_ptr < CAnimBlendHierarchy > GetCustomAnimBlendHierarchy ( CAnimBlendHierarchySAInterface * pInterface ) = 0;
     virtual std::unique_ptr < CAnimBlendSequence >  GetCustomAnimBlendSequence  ( CAnimBlendSequenceSAInterface * pInterface ) = 0;

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ CAnimBlendAssociation * CAnimManagerSA::CreateAnimAssociation ( AssocGroupId ani`
`256`	`256`	`}`
`257`	`257`
`258`	`258`
`259`		`-CAnimBlendStaticAssociationSAInterface * CAnimManagerSA::GetAnimStaticAssociation ( AssocGroupId animGroup, AnimationId animID )`
	`259`	`+CAnimManagerSA::StaticAssocIntface_type CAnimManagerSA::GetAnimStaticAssociation ( AssocGroupId animGroup, AnimationId animID )`
`260`	`260`	`{`
`261`	`261`	`CAnimBlendStaticAssociationSAInterface * pInterface = nullptr;`
`262`	`262`	`DWORD dwFunc = FUNC_CAnimManager_GetAnimAssociation;`
`@@ -268,7 +268,7 @@ CAnimBlendStaticAssociationSAInterface * CAnimManagerSA::GetAnimStaticAssociatio`
`268`	`268`	`mov pInterface, eax`
`269`	`269`	`add esp, 0x8`
`270`	`270`	`}`
`271`		`- return pInterface;`
	`271`	`+ return std::make_unique < CAnimBlendStaticAssociationSA > ( pInterface );`
`272`	`272`	`}`
`273`	`273`
`274`	`274`
`@@ -798,6 +798,11 @@ CAnimBlendHierarchy * CAnimManagerSA::GetAnimBlendHierarchy ( CAnimBlendHierarch`
`798`	`798`	`return NULL;`
`799`	`799`	`}`
`800`	`800`
	`801`	`+CAnimManagerSA::StaticAssocIntface_type CAnimManagerSA::GetAnimStaticAssociation ( CAnimBlendStaticAssociationSAInterface * pInterface )`
	`802`	`+{`
	`803`	`+ return std::make_unique < CAnimBlendStaticAssociationSA > ( pInterface );`
	`804`	`+}`
	`805`	`+`
`801`	`806`	`std::unique_ptr < CAnimBlendHierarchy > CAnimManagerSA::GetCustomAnimBlendHierarchy ( CAnimBlendHierarchySAInterface * pInterface )`
`802`	`807`	`{`
`803`	`808`	`return std::make_unique < CAnimBlendHierarchySA > ( pInterface );`
Original file line number	Diff line number	Diff line change
`@@ -4027,57 +4027,42 @@ CAnimBlendAssociationSAInterface * CClientGame::AddAnimationAndSyncHandler ( RpC`
`4027`	`4027`	`}`
`4028`	`4028`
`4029`	`4029`
`4030`		`-typedef void (__thiscall* hCAnimBlendStaticAssociation_Init)`
`4031`		`-(`
`4032`		`- CAnimBlendStaticAssociationSAInterface * pThis,`
`4033`		`- RpClump * Clump,`
`4034`		`- CAnimBlendHierarchySAInterface * pAnimBlendHierarchy`
`4035`		`-);`
`4036`		`-`
`4037`		`-`
`4038`		`-bool CClientGame::AssocGroupCopyAnimationHandler ( CAnimBlendStaticAssociationSAInterface * pOutAnimStaticAssoc, CAnimBlendAssociationSAInterface * pAnimAssoc, RpClump * pClump, CAnimBlendAssocGroupSAInterface * pAnimAssocGroup, AnimationId animID )`
	`4030`	`+bool CClientGame::AssocGroupCopyAnimationHandler ( CAnimBlendStaticAssociationSAInterface * pOutAnimStaticAssocInterface, CAnimBlendAssociationSAInterface * pAnimAssoc, RpClump * pClump, CAnimBlendAssocGroupSAInterface * pAnimAssocGroup, AnimationId animID )`
`4039`	`4031`	`{`
`4040`		`- auto CAnimBlendStaticAssociation_Init = (hCAnimBlendStaticAssociation_Init)0x4CEC20;`
`4041`	`4032`	`bool isCustomAnimationToPlay = false;`
`4042`		`-`
`4043`	`4033`	`CAnimManager * pAnimationManager = g_pGame->GetAnimManager();`
`4044`	`4034`	`auto pOriginalAnimStaticAssoc = pAnimationManager->GetAnimStaticAssociation ( pAnimAssocGroup->groupID, animID );`
`4045`		`-`
	`4035`	`+ auto pOriginalAnimHierarchyInterface = pOriginalAnimStaticAssoc->GetAnimHierachyInterface ( );`
	`4036`	`+ auto pOutAnimStaticAssoc = pAnimationManager->GetAnimStaticAssociation ( pOutAnimStaticAssocInterface );`
`4046`	`4037`	`CClientPed * pClientPed = GetClientPedByClump ( *pClump );`
`4047`	`4038`	`if ( pClientPed != nullptr )`
`4048`	`4039`	`{`
`4049`		`- auto pReplacedAnimation = pClientPed->GetReplacedAnimation ( pOriginalAnimStaticAssoc->pAnimHeirarchy );`
	`4040`	`+ auto pReplacedAnimation = pClientPed->GetReplacedAnimation ( pOriginalAnimHierarchyInterface );`
`4050`	`4041`	`if ( pReplacedAnimation != nullptr )`
`4051`	`4042`	`{`
`4052`	`4043`	`std::shared_ptr < CIFPAnimations > pIFPAnimations = pReplacedAnimation->pIFP->GetIFPAnimationsPointer ();`
`4053`	`4044`	`InsertAnimationAssociationToMap ( pAnimAssoc, pIFPAnimations );`
`4054`	`4045`
`4055`	`4046`	`// Play our custom animation instead of default`
`4056`		`- CAnimBlendStaticAssociation_Init ( pOutAnimStaticAssoc, pClump, pReplacedAnimation->pAnimationHierarchy );`
	`4047`	`+ pOutAnimStaticAssoc->Initialize ( pClump, pReplacedAnimation->pAnimationHierarchy );`
`4057`	`4048`	`isCustomAnimationToPlay = true;`
`4058`	`4049`	`}`
`4059`	`4050`	`}`
`4060`	`4051`
`4061`	`4052`	`if ( !isCustomAnimationToPlay )`
`4062`	`4053`	`{`
`4063`	`4054`	`// Play default internal animation`
`4064`		`- CAnimBlendStaticAssociation_Init ( pOutAnimStaticAssoc, pClump, pOriginalAnimStaticAssoc->pAnimHeirarchy );`
	`4055`	`+ pOutAnimStaticAssoc->Initialize ( pClump, pOriginalAnimHierarchyInterface );`
`4065`	`4056`	`}`
`4066`	`4057`
`4067`		`- pOutAnimStaticAssoc->sAnimGroup = static_cast < short > ( pAnimAssocGroup->groupID );`
`4068`		`- pOutAnimStaticAssoc->sAnimID = static_cast < short > ( animID );`
`4069`		`-`
`4070`		`- // Total bones in clump. GTA SA is using 32 bones for peds/players`
`4071`		`- pOutAnimStaticAssoc->nNumBlendNodes = pOriginalAnimStaticAssoc->nNumBlendNodes;`
`4072`		`- pOutAnimStaticAssoc->sFlags = pOriginalAnimStaticAssoc->sFlags;`
	`4058`	`+ CopyStaticAssociationProperties ( pOutAnimStaticAssoc, pOriginalAnimStaticAssoc );`
`4073`	`4059`	`return isCustomAnimationToPlay;`
`4074`	`4060`	`}`
`4075`	`4061`
`4076`	`4062`
`4077`	`4063`	`bool CClientGame::BlendAnimationHierarchyHandler ( CAnimBlendAssociationSAInterface * pAnimAssoc, CAnimBlendHierarchySAInterface ** pOutAnimHierarchy, int * pFlags, RpClump * pClump )`
`4078`	`4064`	`{`
`4079`	`4065`	`bool isCustomAnimationToPlay = false;`
`4080`		`-`
`4081`	`4066`	`CAnimManager * pAnimationManager = g_pGame->GetAnimManager();`
`4082`	`4067`	`CClientPed * pClientPed = GetClientPedByClump ( *pClump );`
`4083`	`4068`	`if ( pClientPed != nullptr )`
`@@ -6845,12 +6830,25 @@ void CClientGame::RestreamModel ( unsigned short usModel )`
`6845`	`6830`
`6846`	`6831`	`}`
`6847`	`6832`
	`6833`	`+`
	`6834`	`+void CClientGame::CopyStaticAssociationProperties ( std::unique_ptr < CAnimBlendStaticAssociation > & pOutAnimStaticAssoc, std::unique_ptr < CAnimBlendStaticAssociation > & pOriginalAnimStaticAssoc )`
	`6835`	`+{`
	`6836`	`+ pOutAnimStaticAssoc->SetAnimGroup ( pOriginalAnimStaticAssoc->GetAnimGroup ( ) );`
	`6837`	`+ pOutAnimStaticAssoc->SetAnimID ( pOriginalAnimStaticAssoc->GetAnimID ( ) );`
	`6838`	`+`
	`6839`	`+ // Total bones in clump. GTA SA is using 32 bones for peds/players`
	`6840`	`+ pOutAnimStaticAssoc->SetNumBlendNodes ( pOriginalAnimStaticAssoc->GetNumBlendNodes ( ) );`
	`6841`	`+ pOutAnimStaticAssoc->SetFlags ( pOriginalAnimStaticAssoc->GetFlags ( ) );`
	`6842`	`+}`
	`6843`	`+`
	`6844`	`+`
`6848`	`6845`	`void CClientGame::InsertIFPPointerToMap ( const unsigned int u32BlockNameHash, const std::shared_ptr < CClientIFP > & pIFP )`
`6849`	`6846`	`{`
`6850`	`6847`	`std::lock_guard < std::mutex > mutexGuardedLock ( m_MutexOfIfpPointersMap );`
`6851`	`6848`	`m_mapOfIfpPointers [ u32BlockNameHash ] = pIFP;`
`6852`	`6849`	`}`
`6853`	`6850`
	`6851`	`+`
`6854`	`6852`	`std::shared_ptr < CClientIFP > CClientGame::GetIFPPointerFromMap ( const unsigned int u32BlockNameHash )`
`6855`	`6853`	`{`
`6856`	`6854`	`std::lock_guard < std::mutex > mutexGuardedLock ( m_MutexOfIfpPointersMap );`
`@@ -6862,6 +6860,7 @@ std::shared_ptr < CClientIFP > CClientGame::GetIFPPointerFromMap ( const unsigne`
`6862`	`6860`	`return nullptr;`
`6863`	`6861`	`}`
`6864`	`6862`
	`6863`	`+`
`6865`	`6864`	`void CClientGame::RemoveIFPPointerFromMap ( const unsigned int u32BlockNameHash )`
`6866`	`6865`	`{`
`6867`	`6866`	`std::lock_guard < std::mutex > mutexGuardedLock ( m_MutexOfIfpPointersMap );`
`@@ -6875,12 +6874,14 @@ void CClientGame::InsertPedPointerToSet ( CClientPed * pPed )`
`6875`	`6874`	`m_setOfPedPointers.insert ( pPed );`
`6876`	`6875`	`}`
`6877`	`6876`
	`6877`	`+`
`6878`	`6878`	`void CClientGame::RemovePedPointerFromSet ( CClientPed * pPed )`
`6879`	`6879`	`{`
`6880`	`6880`	`std::lock_guard < std::mutex > mutexGuardedLock ( m_MutexOfPedPointersSet );`
`6881`	`6881`	`m_setOfPedPointers.erase ( pPed );`
`6882`	`6882`	`}`
`6883`	`6883`
	`6884`	`+`
`6884`	`6885`	`CClientPed * CClientGame::GetClientPedByClump ( const RpClump & Clump )`
`6885`	`6886`	`{`
`6886`	`6887`	`std::lock_guard < std::mutex > mutexGuardedLock ( m_MutexOfPedPointersSet );`
`@@ -6902,6 +6903,7 @@ CClientPed * CClientGame::GetClientPedByClump ( const RpClump & Clump )`
`6902`	`6903`	`return nullptr;`
`6903`	`6904`	`}`
`6904`	`6905`
	`6906`	`+`
`6905`	`6907`	`void CClientGame::OnClientIFPUnload ( const std::shared_ptr < CClientIFP > & IFP )`
`6906`	`6908`	`{`
`6907`	`6909`	`std::lock_guard < std::mutex > mutexGuardedLock ( m_MutexOfPedPointersSet );`
`@@ -6931,12 +6933,14 @@ void CClientGame::OnClientIFPUnload ( const std::shared_ptr < CClientIFP > & IFP`
`6931`	`6933`	`}`
`6932`	`6934`	`}`
`6933`	`6935`
	`6936`	`+`
`6934`	`6937`	`void CClientGame::InsertAnimationAssociationToMap ( CAnimBlendAssociationSAInterface * pAnimAssociation, const std::shared_ptr < CIFPAnimations > & pIFPAnimations )`
`6935`	`6938`	`{`
`6936`	`6939`	`std::lock_guard < std::mutex > mutexGuardedLock ( m_MutexOfAnimationAssociationsMap );`
`6937`	`6940`	`m_mapOfCustomAnimationAssociations [ pAnimAssociation ] = pIFPAnimations;`
`6938`	`6941`	`}`
`6939`	`6942`
	`6943`	`+`
`6940`	`6944`	`void CClientGame::RemoveAnimationAssociationFromMap ( CAnimBlendAssociationSAInterface * pAnimAssociation )`
`6941`	`6945`	`{`
`6942`	`6946`	`std::lock_guard < std::mutex > mutexGuardedLock ( m_MutexOfAnimationAssociationsMap );`