Removed IFP mutexes from CClientGame and CClientPed

They were not needed. I used them because I was in doubt whether GTA:SA is using a secondary thread. I confirmed that it's not using another thread with the help of SharedUtil::IsMainThread() method.
- Suggested by Jusonex

Author: codenulls

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -6785,13 +6785,11 @@ void CClientGame::CopyStaticAssociationProperties(std::unique_ptr<CAnimBlendStat
 
 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);
     auto                        it = m_mapOfIfpPointers.find(u32BlockNameHash);
     if (it != m_mapOfIfpPointers.end())
     {
@@ -6802,25 +6800,21 @@ std::shared_ptr<CClientIFP> CClientGame::GetIFPPointerFromMap(const unsigned int
 
 void CClientGame::RemoveIFPPointerFromMap(const unsigned int u32BlockNameHash)
 {
-    std::lock_guard<std::mutex> mutexGuardedLock(m_MutexOfIfpPointersMap);
     m_mapOfIfpPointers.erase(u32BlockNameHash);
 }
 
 void CClientGame::InsertPedPointerToSet(CClientPed* pPed)
 {
-    std::lock_guard<std::mutex> mutexGuardedLock(m_MutexOfPedPointersSet);
     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);
     for (auto& pPed : m_setOfPedPointers)
     {
         CEntity* pEntity = pPed->GetGameEntity();
@@ -6841,7 +6835,6 @@ CClientPed* CClientGame::GetClientPedByClump(const RpClump& Clump)
 
 void CClientGame::OnClientIFPUnload(const std::shared_ptr<CClientIFP>& IFP)
 {
-    std::lock_guard<std::mutex> mutexGuardedLock(m_MutexOfPedPointersSet);
     IFP->MarkAsUnloading();
     for (auto& pPed : m_setOfPedPointers)
     {
@@ -6870,12 +6863,10 @@ 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);
     m_mapOfCustomAnimationAssociations.erase(pAnimAssociation);
 }

Client/mods/deathmatch/logic/CClientGame.h

@@ -831,13 +831,8 @@ class CClientGame
 
     // (unsigned int) Key is the hash of custom block name that is supplied to engineLoadIFP
     std::map<unsigned int, std::shared_ptr<CClientIFP> > m_mapOfIfpPointers;
-    mutable std::mutex                                   m_MutexOfIfpPointersMap;
-
     std::set<CClientPed*> m_setOfPedPointers;
-    mutable std::mutex    m_MutexOfPedPointersSet;
-
     AnimAssociations_type m_mapOfCustomAnimationAssociations;
-    mutable std::mutex    m_MutexOfAnimationAssociationsMap;
 };
 
 extern CClientGame* g_pClientGame;

Client/mods/deathmatch/logic/CClientPed.cpp

@@ -6041,20 +6041,16 @@ void CClientPed::ReplaceAnimation(CAnimBlendHierarchy* pInternalAnimHierarchy, c
     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()))
@@ -6066,7 +6062,6 @@ 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++)
     {
@@ -6077,13 +6072,11 @@ 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

@@ -708,7 +708,6 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule
 
     // Key: Internal GTA animation, Value: Custom Animation
     ReplacedAnim_type  m_mapOfReplacedAnimations;
-    mutable std::mutex m_MutexOfReplacedAnimationsMap;
 };
 
 #endif