Replaced Animations map is now thread-safe in CClientPed

Author: codenulls

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -6210,11 +6210,20 @@ void CClientPed::ReplaceAnimation ( CAnimBlendHierarchy * pInternalAnimHierarchy
     SReplacedAnimation replacedAnimation;
     replacedAnimation.pIFP = pIFP;
     replacedAnimation.pAnimationHierarchy = pCustomAnimHierarchy;
+
+    std::lock_guard < std::mutex > mutexGuardedLock ( m_MutexOfReplacedAnimationsMap );
     m_mapOfReplacedAnimations [ pInternalAnimHierarchy->GetInterface () ] = replacedAnimation;
 }
 
+void CClientPed::RestoreAnimation ( CAnimBlendHierarchy * pInternalAnimHierarchy )
+{
+    std::lock_guard < std::mutex > mutexGuardedLock ( m_MutexOfReplacedAnimationsMap );
+    m_mapOfReplacedAnimations.erase ( pInternalAnimHierarchy->GetInterface () );
+}
+
 void CClientPed::RestoreAnimations ( const std::shared_ptr < CClientIFP > & IFP )
 {
+    std::lock_guard < std::mutex > mutexGuardedLock ( m_MutexOfReplacedAnimationsMap );
     for ( auto const& x : m_mapOfReplacedAnimations )
     {
         if ( std::addressof ( *IFP.get ( ) ) == std::addressof ( *x.second.pIFP.get ( ) ) )
@@ -6226,6 +6235,7 @@ void CClientPed::RestoreAnimations ( const std::shared_ptr < CClientIFP > & IFP
 
 void CClientPed::RestoreAnimations ( CAnimBlock & animationBlock )
 {
+    std::lock_guard < std::mutex > mutexGuardedLock ( m_MutexOfReplacedAnimationsMap );
     const size_t cAnimations = animationBlock.GetAnimationCount ( );
     for ( size_t i = 0; i < cAnimations; i++ )
     {
@@ -6234,8 +6244,15 @@ void CClientPed::RestoreAnimations ( CAnimBlock & animationBlock )
     }
 }
 
+void CClientPed::RestoreAllAnimations ( void )
+{
+    std::lock_guard < std::mutex > mutexGuardedLock ( m_MutexOfReplacedAnimationsMap );
+    m_mapOfReplacedAnimations.clear ( );
+}
+
 SReplacedAnimation * CClientPed::GetReplacedAnimation ( CAnimBlendHierarchySAInterface * pInternalHierarchyInterface )
 {
+    std::lock_guard < std::mutex > mutexGuardedLock ( m_MutexOfReplacedAnimationsMap );
     CClientPed::ReplacedAnim_type::iterator it;
     it = m_mapOfReplacedAnimations.find ( pInternalHierarchyInterface );
     if ( it != m_mapOfReplacedAnimations.end ( ) )

Client/mods/deathmatch/logic/CClientPed.h

@@ -485,10 +485,10 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule
     inline const unsigned int & GetCustomAnimationNameHash      ( void ) { return m_u32CustomAnimationNameHash; }
 
     void                        ReplaceAnimation                ( CAnimBlendHierarchy * pInternalAnimHierarchy, const std::shared_ptr < CClientIFP > & pIFP, CAnimBlendHierarchySAInterface * pCustomAnimHierarchy );
-    inline void                 RestoreAnimation                ( CAnimBlendHierarchy * pInternalAnimHierarchy ) { m_mapOfReplacedAnimations.erase ( pInternalAnimHierarchy->GetInterface () ); }
+    void                        RestoreAnimation                ( CAnimBlendHierarchy * pInternalAnimHierarchy );
     void                        RestoreAnimations               ( const std::shared_ptr < CClientIFP > & IFP );
     void                        RestoreAnimations               ( CAnimBlock & animationBlock );
-    inline void                 RestoreAllAnimations            ( void ) { m_mapOfReplacedAnimations.clear ( ); }
+    void                        RestoreAllAnimations            ( void );
     SReplacedAnimation *        GetReplacedAnimation            ( CAnimBlendHierarchySAInterface * pInternalHierarchyInterface );
 
 protected:
@@ -698,6 +698,7 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule
 
     // Key: Internal GTA animation, Value: Custom Animation
     ReplacedAnim_type m_mapOfReplacedAnimations;
+    mutable std::mutex m_MutexOfReplacedAnimationsMap;
 };
 
 #endif