added 3 new functions for finding the correct CClientPed * in a map of Ped clumps.

Author: codenulls

Client/game_sa/CAnimManagerSA.cpp

@@ -760,3 +760,26 @@ CAnimBlendHierarchy * CAnimManagerSA::GetAnimBlendHierarchy ( CAnimBlendHierarch
     }
     return NULL;
 }
+
+void CAnimManagerSA::InsertPedClumpToMap ( RpClump * pClump, CClientPed * pClientPed )
+{
+    if ( m_mapOfPedClumps.count ( pClump ) == 0 )
+    { 
+        m_mapOfPedClumps [ pClump ] = pClientPed;
+    }
+}
+
+void CAnimManagerSA::RemovePedClumpFromMap ( RpClump * pClump )
+{
+    m_mapOfPedClumps.erase ( pClump );
+}
+
+CClientPed * CAnimManagerSA::GetClientPedFromClumpMap ( RpClump * pClump )
+{
+    ClumpMap_type::iterator it = m_mapOfPedClumps.find ( pClump );
+    if ( it != m_mapOfPedClumps.end ( ) )
+    {
+        return it->second;
+    }
+    return nullptr;
+}

Client/game_sa/CAnimManagerSA.h

@@ -20,6 +20,7 @@
 
 #include "Common.h"
 #include <list>
+#include <map>
 
 #define FUNC_CAnimManager_Initialize                        0x5bf6b0
 #define FUNC_CAnimManager_Shutdown                          0x4d4130
@@ -78,6 +79,8 @@ class CAnimManagerSAInterface
 
 class CAnimManagerSA : public CAnimManager
 {
+    typedef std::map < RpClump *, CClientPed * > ClumpMap_type;
+
 public:
                                 CAnimManagerSA                          ( void );
                                 ~CAnimManagerSA                         ( void );
@@ -146,12 +149,20 @@ class CAnimManagerSA : public CAnimManager
     CAnimBlendAssocGroup *      GetAnimBlendAssocGroup                  ( CAnimBlendAssocGroupSAInterface * pInterface );
     CAnimBlock *                GetAnimBlock                            ( CAnimBlockSAInterface * pInterface );
     CAnimBlendHierarchy *       GetAnimBlendHierarchy                   ( CAnimBlendHierarchySAInterface * pInterface );
+    
+    // This is used in AddAnimationHandler and AddAnimationAndSyncHandler for playing
+    // custom animations and to help in replacing and restoring animations 
+    void                        InsertPedClumpToMap                     ( RpClump * pClump, CClientPed * pClientPed );
+    void                        RemovePedClumpFromMap                   ( RpClump * pClump );
+    CClientPed *                GetClientPedFromClumpMap                ( RpClump * pClump );
 
 private:
     CAnimBlendAssocGroup *      m_pAnimAssocGroups [ MAX_ANIM_GROUPS ];
     CAnimBlendHierarchy *       m_pAnimations [ MAX_ANIMATIONS ];
     CAnimBlock *                m_pAnimBlocks [ MAX_ANIM_BLOCKS ];
-    std::list < CAnimBlendAssociation *  > m_Associations;
+    std::list < CAnimBlendAssociation *  > m_Associations;                   
+    ClumpMap_type               m_mapOfPedClumps; 
+
 };
 
 #endif

Client/sdk/game/CAnimManager.h

@@ -24,6 +24,7 @@ class CAnimBlendAssocGroup;
 class CAnimBlendHierarchy;
 class CAnimBlock;
 class CAnimBlendAssociation;
+class CClientPed;
 struct RpClump;
 struct RwStream;
 struct AnimAssocDefinition;
@@ -102,6 +103,10 @@ class CAnimManager
     virtual CAnimBlendAssocGroup *      GetAnimBlendAssocGroup                  ( CAnimBlendAssocGroupSAInterface * pInterface ) = 0;
     virtual CAnimBlock *                GetAnimBlock                            ( CAnimBlockSAInterface * pInterface ) = 0;
     virtual CAnimBlendHierarchy *       GetAnimBlendHierarchy                   ( CAnimBlendHierarchySAInterface * pInterface ) = 0;
+
+    virtual void                        InsertPedClumpToMap                     ( RpClump * pClump, CClientPed * pEntity ) = 0;
+    virtual void                        RemovePedClumpFromMap                   ( RpClump * pClump ) = 0;
+    virtual CClientPed *                GetClientPedFromClumpMap                ( RpClump * pClump ) = 0;
 };
 
 #endif