Fix warning c4150 when deleting Game SA interface

codenulls · codenulls · commit a311d8d809b2 · 2018-04-12T01:11:43.000+05:00
Visual studio was generating a warning when calling delete operator on hierarchy and sequnece interface in Client Deathmatch, so replaced it with CAnimManager::DeleteCustomAnimHierarchyInterface and CAnimManager::DeleteCustomAnimSequenceInterface in CIFPAnimations::DeleteAnimations and CClientIFP::MoveSequencesWithDummies

Also, applied source formatting
diff --git a/Client/game_sa/CAnimBlendAssocGroupSA.h b/Client/game_sa/CAnimBlendAssocGroupSA.h
@@ -51,7 +51,7 @@ class CAnimBlendAssocGroupSA : public CAnimBlendAssocGroup
     int                               GetNumAnimations(void);
     CAnimBlock*                       GetAnimBlock(void);
     CAnimBlendStaticAssociation*      GetAnimation(unsigned int ID);
-    AssocGroupId                      GetGroupID(void) { return m_pInterface->groupID;};
+    AssocGroupId                      GetGroupID(void) { return m_pInterface->groupID; };
     void                              CreateAssociations(const char* szBlockName);
 
     bool IsLoaded(void);
diff --git a/Client/game_sa/CAnimBlendSequenceSA.cpp b/Client/game_sa/CAnimBlendSequenceSA.cpp
@@ -58,7 +58,7 @@ void CAnimBlendSequenceSA::SetKeyFrames(size_t cKeyFrames, bool bRoot, bool bCom
     }
 }
 
-void CAnimBlendSequenceSA::CopySequenceProperties( CAnimBlendSequenceSAInterface * pAnimSequenceInterface )
+void CAnimBlendSequenceSA::CopySequenceProperties(CAnimBlendSequenceSAInterface* pAnimSequenceInterface)
 {
     *m_pInterface = *pAnimSequenceInterface;
 }
diff --git a/Client/game_sa/CAnimBlendSequenceSA.h b/Client/game_sa/CAnimBlendSequenceSA.h
@@ -44,7 +44,7 @@ class CAnimBlendSequenceSA : public CAnimBlendSequence
     BYTE*                          GetKeyFrames(void) { return m_pInterface->pKeyFrames; }
     unsigned short                 GetKeyFramesCount(void) { return m_pInterface->sNumKeyFrames; }
     bool                           IsBigChunkForAllSequences(void) { return ((m_pInterface->sFlags >> 3) & 1); }
-    void                           CopySequenceProperties(CAnimBlendSequenceSAInterface * pAnimSequenceInterface);
+    void                           CopySequenceProperties(CAnimBlendSequenceSAInterface* pAnimSequenceInterface);
     CAnimBlendSequenceSAInterface* GetInterface(void) { return m_pInterface; }
 
 protected:
diff --git a/Client/game_sa/CAnimManagerSA.cpp b/Client/game_sa/CAnimManagerSA.cpp
@@ -776,6 +776,16 @@ std::unique_ptr<CAnimBlendSequence> CAnimManagerSA::GetCustomAnimBlendSequence(v
     return std::make_unique<CAnimBlendSequenceSA>(pInterface);
 }
 
+void CAnimManagerSA::DeleteCustomAnimHierarchyInterface(CAnimBlendHierarchySAInterface* pInterface)
+{
+    delete pInterface;
+}
+
+void CAnimManagerSA::DeleteCustomAnimSequenceInterface(CAnimBlendSequenceSAInterface* pInterface)
+{
+    delete pInterface;
+}
+
 bool CAnimManagerSA::isGateWayAnimationHierarchy(CAnimBlendHierarchySAInterface* pInterface)
 {
     return pGame->GetKeyGen()->GetUppercaseKey(m_kGateWayAnimationName.c_str()) == pInterface->iHashKey;
diff --git a/Client/game_sa/CAnimManagerSA.h b/Client/game_sa/CAnimManagerSA.h
@@ -159,10 +159,13 @@ class CAnimManagerSA : public CAnimManager
     std::unique_ptr<CAnimBlendHierarchy> GetCustomAnimBlendHierarchy(CAnimBlendHierarchySAInterface *pInterface);
     std::unique_ptr<CAnimBlendSequence>  GetCustomAnimBlendSequence(CAnimBlendSequenceSAInterface *pInterface);
 
-    // Warning! These two functions will create a new interface ( dynamic memory memory allocation ) 
+    // Warning! These two functions will create a new interface ( dynamic memory memory allocation )
     std::unique_ptr<CAnimBlendHierarchy> GetCustomAnimBlendHierarchy(void);
     std::unique_ptr<CAnimBlendSequence>  GetCustomAnimBlendSequence(void);
 
+    void DeleteCustomAnimHierarchyInterface(CAnimBlendHierarchySAInterface *pInterface);
+    void DeleteCustomAnimSequenceInterface(CAnimBlendSequenceSAInterface *pInterface);
+
     bool           isGateWayAnimationHierarchy(CAnimBlendHierarchySAInterface *pInterface);
     const SString &GetGateWayBlockName(void) { return m_kGateWayBlockName; };
     const SString &GetGateWayAnimationName(void) { return m_kGateWayAnimationName; };
diff --git a/Client/mods/deathmatch/logic/CClientGame.cpp b/Client/mods/deathmatch/logic/CClientGame.cpp
@@ -3965,7 +3965,7 @@ bool CClientGame::AssocGroupCopyAnimationHandler(CAnimBlendStaticAssociationSAIn
 {
     bool          isCustomAnimationToPlay = false;
     CAnimManager* pAnimationManager = g_pGame->GetAnimManager();
-    auto          pAnimAssocGroup   = pAnimationManager->GetAnimBlendAssocGroup (pAnimAssocGroupInterface);
+    auto          pAnimAssocGroup = pAnimationManager->GetAnimBlendAssocGroup(pAnimAssocGroupInterface);
     auto          pOriginalAnimStaticAssoc = pAnimationManager->GetAnimStaticAssociation(pAnimAssocGroup->GetGroupID(), animID);
     auto          pOriginalAnimHierarchyInterface = pOriginalAnimStaticAssoc->GetAnimHierachyInterface();
     auto          pOutAnimStaticAssoc = pAnimationManager->GetAnimStaticAssociation(pOutAnimStaticAssocInterface);
@@ -6790,7 +6790,7 @@ void CClientGame::InsertIFPPointerToMap(const unsigned int u32BlockNameHash, con
 
 std::shared_ptr<CClientIFP> CClientGame::GetIFPPointerFromMap(const unsigned int u32BlockNameHash)
 {
-    auto                        it = m_mapOfIfpPointers.find(u32BlockNameHash);
+    auto it = m_mapOfIfpPointers.find(u32BlockNameHash);
     if (it != m_mapOfIfpPointers.end())
     {
         return it->second;
diff --git a/Client/mods/deathmatch/logic/CClientGame.h b/Client/mods/deathmatch/logic/CClientGame.h
@@ -831,8 +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;
-    std::set<CClientPed*> m_setOfPedPointers;
-    AnimAssociations_type m_mapOfCustomAnimationAssociations;
+    std::set<CClientPed*>                                m_setOfPedPointers;
+    AnimAssociations_type                                m_mapOfCustomAnimationAssociations;
 };
 
 extern CClientGame* g_pClientGame;
diff --git a/Client/mods/deathmatch/logic/CClientIFP.cpp b/Client/mods/deathmatch/logic/CClientIFP.cpp
@@ -108,7 +108,7 @@ void CClientIFP::ReadIFPVersion2(bool bAnp3)
 WORD CClientIFP::ReadSequencesWithDummies(std::unique_ptr<CAnimBlendHierarchy>& pAnimationHierarchy)
 {
     SequenceMapType MapOfSequences;
-    WORD wUnknownSequences = ReadSequences(pAnimationHierarchy, MapOfSequences);
+    WORD            wUnknownSequences = ReadSequences(pAnimationHierarchy, MapOfSequences);
 
     MoveSequencesWithDummies(pAnimationHierarchy, MapOfSequences);
     WORD cSequences = m_kcIFPSequences + wUnknownSequences;
@@ -140,30 +140,30 @@ WORD CClientIFP::ReadSequencesVersion1(std::unique_ptr<CAnimBlendHierarchy>& pAn
         }
 
         std::unique_ptr<CAnimBlendSequence> pAnimationSequence;
-        bool bUnknownSequence = iBoneID == eBoneType::UNKNOWN;
+        bool                                bUnknownSequence = iBoneID == eBoneType::UNKNOWN;
         if (bUnknownSequence)
         {
             size_t UnkownSequenceIndex = m_kcIFPSequences + wUnknownSequences;
-            auto pAnimationSequenceInterface = pAnimationHierarchy->GetSequence(UnkownSequenceIndex);
+            auto   pAnimationSequenceInterface = pAnimationHierarchy->GetSequence(UnkownSequenceIndex);
             pAnimationSequence = m_pAnimManager->GetCustomAnimBlendSequence(pAnimationSequenceInterface);
             wUnknownSequences++;
         }
         else
-        { 
+        {
             pAnimationSequence = m_pAnimManager->GetCustomAnimBlendSequence();
         }
         InitializeAnimationSequence(pAnimationSequence, Anim.Name, iBoneID);
 
         eFrameType iFrameType = ReadKfrm();
         if ((ReadSequenceKeyFrames(pAnimationSequence, iFrameType, Anim.Frames)) && (!bUnknownSequence))
         {
-            MapOfSequences[iBoneID] = std::move (pAnimationSequence);
+            MapOfSequences[iBoneID] = std::move(pAnimationSequence);
         }
     }
     return wUnknownSequences;
 }
 
-WORD CClientIFP::ReadSequencesVersion2(std::unique_ptr<CAnimBlendHierarchy>& pAnimationHierarchy,SequenceMapType& MapOfSequences)
+WORD CClientIFP::ReadSequencesVersion2(std::unique_ptr<CAnimBlendHierarchy>& pAnimationHierarchy, SequenceMapType& MapOfSequences)
 {
     WORD wUnknownSequences = 0;
     for (size_t SequenceIndex = 0; SequenceIndex < pAnimationHierarchy->GetNumSequences(); SequenceIndex++)
@@ -177,7 +177,7 @@ WORD CClientIFP::ReadSequencesVersion2(std::unique_ptr<CAnimBlendHierarchy>& pAn
         if (bUnknownSequence)
         {
             size_t UnkownSequenceIndex = m_kcIFPSequences + wUnknownSequences;
-            auto pAnimationSequenceInterface = pAnimationHierarchy->GetSequence(UnkownSequenceIndex);
+            auto   pAnimationSequenceInterface = pAnimationHierarchy->GetSequence(UnkownSequenceIndex);
             pAnimationSequence = m_pAnimManager->GetCustomAnimBlendSequence(pAnimationSequenceInterface);
             wUnknownSequences++;
         }
@@ -451,13 +451,13 @@ void CClientIFP::MoveSequencesWithDummies(std::unique_ptr<CAnimBlendHierarchy>&
 
         auto pAnimationSequenceInterface = pAnimationHierarchy->GetSequence(SequenceIndex);
         auto pAnimationSequence = m_pAnimManager->GetCustomAnimBlendSequence(pAnimationSequenceInterface);
-        auto                           it = mapOfSequences.find(BoneID);
+        auto it = mapOfSequences.find(BoneID);
         if (it != mapOfSequences.end())
         {
             auto pMapAnimSequenceInterface = it->second->GetInterface();
-            pAnimationSequence->CopySequenceProperties (pMapAnimSequenceInterface);
+            pAnimationSequence->CopySequenceProperties(pMapAnimSequenceInterface);
             // Delete the interface because we are moving, not copying
-            delete pMapAnimSequenceInterface;
+            m_pAnimManager->DeleteCustomAnimSequenceInterface(pMapAnimSequenceInterface);
         }
         else
         {
diff --git a/Client/mods/deathmatch/logic/CClientIFP.h b/Client/mods/deathmatch/logic/CClientIFP.h
@@ -8,7 +8,7 @@
 class CClientIFP : public CClientEntity, CFileReader
 {
 public:
-    typedef CIFPAnimations::SAnimation SAnimation;
+    typedef CIFPAnimations::SAnimation                           SAnimation;
     typedef std::map<DWORD, std::unique_ptr<CAnimBlendSequence>> SequenceMapType;
 
     struct SBase
@@ -212,10 +212,10 @@ class CClientIFP : public CClientEntity, CFileReader
     void ReadIFPVersion1(void);
     void ReadIFPVersion2(bool bAnp3);
 
-    WORD ReadSequencesWithDummies(std::unique_ptr<CAnimBlendHierarchy>& pAnimationHierarchy);
-    WORD ReadSequences(std::unique_ptr<CAnimBlendHierarchy>& pAnimationHierarchy, SequenceMapType& MapOfSequences);
-    WORD ReadSequencesVersion1(std::unique_ptr<CAnimBlendHierarchy>& pAnimationHierarchy, SequenceMapType& MapOfSequences);
-    WORD ReadSequencesVersion2(std::unique_ptr<CAnimBlendHierarchy>& pAnimationHierarchy, SequenceMapType& MapOfSequences);
+    WORD         ReadSequencesWithDummies(std::unique_ptr<CAnimBlendHierarchy>& pAnimationHierarchy);
+    WORD         ReadSequences(std::unique_ptr<CAnimBlendHierarchy>& pAnimationHierarchy, SequenceMapType& MapOfSequences);
+    WORD         ReadSequencesVersion1(std::unique_ptr<CAnimBlendHierarchy>& pAnimationHierarchy, SequenceMapType& MapOfSequences);
+    WORD         ReadSequencesVersion2(std::unique_ptr<CAnimBlendHierarchy>& pAnimationHierarchy, SequenceMapType& MapOfSequences);
     std::int32_t ReadSequenceVersion1(SAnim& Anim);
     void         ReadSequenceVersion2(SSequenceHeaderV2& ObjectNode);
 
@@ -243,7 +243,8 @@ class CClientIFP : public CClientEntity, CFileReader
                                        const std::int32_t& iSequences);
     void  InitializeAnimationSequence(std::unique_ptr<CAnimBlendSequence>& pAnimationSequence, const SString& strName, const std::int32_t& iBoneID);
     void  PreProcessAnimationHierarchy(std::unique_ptr<CAnimBlendHierarchy>& pAnimationHierarchy);
-    void  MoveSequencesWithDummies(std::unique_ptr<CAnimBlendHierarchy>& pAnimationHierarchy, std::map<DWORD, std::unique_ptr<CAnimBlendSequence>>& mapOfSequences);
+    void  MoveSequencesWithDummies(std::unique_ptr<CAnimBlendHierarchy>&                 pAnimationHierarchy,
+                                   std::map<DWORD, std::unique_ptr<CAnimBlendSequence>>& mapOfSequences);
     BYTE* AllocateSequencesMemory(std::unique_ptr<CAnimBlendHierarchy>& pAnimationHierarchy);
 
     void    InsertAnimationDummySequence(std::unique_ptr<CAnimBlendSequence>& pAnimationSequence, const SString& BoneName, const DWORD& dwBoneID);
diff --git a/Client/mods/deathmatch/logic/CClientPed.cpp b/Client/mods/deathmatch/logic/CClientPed.cpp
@@ -6062,7 +6062,7 @@ void CClientPed::RestoreAnimations(const std::shared_ptr<CClientIFP>& IFP)
 
 void CClientPed::RestoreAnimations(CAnimBlock& animationBlock)
 {
-    const size_t                cAnimations = animationBlock.GetAnimationCount();
+    const size_t cAnimations = animationBlock.GetAnimationCount();
     for (size_t i = 0; i < cAnimations; i++)
     {
         auto pAnimHierarchyInterface = animationBlock.GetAnimationHierarchyInterface(i);
diff --git a/Client/mods/deathmatch/logic/CClientPed.h b/Client/mods/deathmatch/logic/CClientPed.h
@@ -707,7 +707,7 @@ class CClientPed : public CClientStreamElement, public CAntiCheatModule
     std::shared_ptr<CClientIFP> m_pCustomAnimationIFP;
 
     // Key: Internal GTA animation, Value: Custom Animation
-    ReplacedAnim_type  m_mapOfReplacedAnimations;
+    ReplacedAnim_type m_mapOfReplacedAnimations;
 };
 
 #endif
diff --git a/Client/mods/deathmatch/logic/CIFPAnimations.cpp b/Client/mods/deathmatch/logic/CIFPAnimations.cpp
@@ -33,6 +33,6 @@ void CIFPAnimations::DeleteAnimations(void)
             }
         }
         delete Animation.pSequencesMemory;
-        delete Animation.pHierarchy->GetInterface();
+        pAnimManager->DeleteCustomAnimHierarchyInterface(Animation.pHierarchy->GetInterface());
     }
 }
diff --git a/Client/mods/deathmatch/logic/CIFPAnimations.h b/Client/mods/deathmatch/logic/CIFPAnimations.h
@@ -7,10 +7,10 @@ class CIFPAnimations
 public:
     struct SAnimation
     {
-        SString                        Name;
-        unsigned int                   uiNameHash;
+        SString                              Name;
+        unsigned int                         uiNameHash;
         std::unique_ptr<CAnimBlendHierarchy> pHierarchy;
-        BYTE*                          pSequencesMemory;
+        BYTE*                                pSequencesMemory;
     };
 
     std::vector<SAnimation> vecAnimations;
diff --git a/Client/mods/deathmatch/logic/CIFPEngine.cpp b/Client/mods/deathmatch/logic/CIFPEngine.cpp
@@ -54,7 +54,7 @@ bool CIFPEngine::EngineReplaceAnimation(CClientEntity* pEntity, const SString& s
 }
 
 bool CIFPEngine::EngineRestoreAnimation(CClientEntity* pEntity, const SString& strInternalBlockName, const SString& strInternalAnimName,
- const eRestoreAnimation& eRestoreType)
+                                        const eRestoreAnimation& eRestoreType)
 {
     if (IS_PED(pEntity))
     {
diff --git a/Client/multiplayer_sa/CMultiplayerSA.h b/Client/multiplayer_sa/CMultiplayerSA.h
@@ -41,11 +41,11 @@ enum eRadioStationID
 };
 
 typedef void(__thiscall* hCAnimBlendStaticAssociation_FreeSequenceArray)(CAnimBlendStaticAssociationSAInterface* pThis);
-typedef void(__cdecl *  hUncompressAnimation) (CAnimBlendHierarchySAInterface * pAnimBlendHierarchyInterface);
-typedef void *(__cdecl *  hCAnimBlendAssociation_NewOperator) (size_t iSizeInBytes);
+typedef void(__cdecl* hUncompressAnimation)(CAnimBlendHierarchySAInterface* pAnimBlendHierarchyInterface);
+typedef void*(__cdecl* hCAnimBlendAssociation_NewOperator)(size_t iSizeInBytes);
 
-typedef CAnimBlendAssociationSAInterface * (__thiscall *  hCAnimBlendAssociation_Constructor_staticAssocByReference)
-(CAnimBlendAssociationSAInterface * pThis, CAnimBlendStaticAssociationSAInterface& StaticAssociationByReference);
+typedef CAnimBlendAssociationSAInterface*(__thiscall* hCAnimBlendAssociation_Constructor_staticAssocByReference)(
+    CAnimBlendAssociationSAInterface* pThis, CAnimBlendStaticAssociationSAInterface& StaticAssociationByReference);
 
 class CMultiplayerSA : public CMultiplayer
 {
diff --git a/Client/multiplayer_sa/CMultiplayerSA_CustomAnimations.cpp b/Client/multiplayer_sa/CMultiplayerSA_CustomAnimations.cpp
@@ -21,10 +21,10 @@ auto UncompressAnimation = (hUncompressAnimation)0x4d41c0;
 auto CAnimBlendAssociation_NewOperator = (hCAnimBlendAssociation_NewOperator)0x082119A;
 auto CAnimBlendAssociation_Constructor_staticAssocByReference = (hCAnimBlendAssociation_Constructor_staticAssocByReference)0x4CF080;
 
-AddAnimationHandler*              m_pAddAnimationHandler = nullptr;
-AddAnimationAndSyncHandler*       m_pAddAnimationAndSyncHandler = nullptr;
-AssocGroupCopyAnimationHandler*   m_pAssocGroupCopyAnimationHandler = nullptr;
-BlendAnimationHierarchyHandler*   m_pBlendAnimationHierarchyHandler = nullptr;
+AddAnimationHandler*            m_pAddAnimationHandler = nullptr;
+AddAnimationAndSyncHandler*     m_pAddAnimationAndSyncHandler = nullptr;
+AssocGroupCopyAnimationHandler* m_pAssocGroupCopyAnimationHandler = nullptr;
+BlendAnimationHierarchyHandler* m_pBlendAnimationHierarchyHandler = nullptr;
 
 int _cdecl OnCAnimBlendAssocGroupCopyAnimation(AssocGroupId animGroup, int iAnimId);
 
@@ -48,22 +48,24 @@ void CMultiplayerSA::SetBlendAnimationHierarchyHandler(BlendAnimationHierarchyHa
     m_pBlendAnimationHierarchyHandler = pHandler;
 }
 
-CAnimBlendAssociationSAInterface * __cdecl CAnimBlendAssocGroup_CopyAnimation ( RpClump* pClump, CAnimBlendAssocGroupSAInterface* pAnimAssocGroupInterface, AnimationId animID )
+CAnimBlendAssociationSAInterface* __cdecl CAnimBlendAssocGroup_CopyAnimation(RpClump* pClump, CAnimBlendAssocGroupSAInterface* pAnimAssocGroupInterface,
+                                                                             AnimationId animID)
 {
-	auto pAnimAssociationInterface = reinterpret_cast < CAnimBlendAssociationSAInterface * > (CAnimBlendAssociation_NewOperator ( sizeof (CAnimBlendAssociationSAInterface)));
-	if (pAnimAssociationInterface)
-	{
-		CAnimBlendStaticAssociationSAInterface staticAnimAssociationInterface;
+    auto pAnimAssociationInterface =
+        reinterpret_cast<CAnimBlendAssociationSAInterface*>(CAnimBlendAssociation_NewOperator(sizeof(CAnimBlendAssociationSAInterface)));
+    if (pAnimAssociationInterface)
+    {
+        CAnimBlendStaticAssociationSAInterface staticAnimAssociationInterface;
 
-		m_pAssocGroupCopyAnimationHandler(&staticAnimAssociationInterface, pAnimAssociationInterface, pClump, pAnimAssocGroupInterface, animID);
+        m_pAssocGroupCopyAnimationHandler(&staticAnimAssociationInterface, pAnimAssociationInterface, pClump, pAnimAssocGroupInterface, animID);
 
-		UncompressAnimation(staticAnimAssociationInterface.pAnimHeirarchy);
+        UncompressAnimation(staticAnimAssociationInterface.pAnimHeirarchy);
 
-		CAnimBlendAssociation_Constructor_staticAssocByReference(pAnimAssociationInterface, staticAnimAssociationInterface);
+        CAnimBlendAssociation_Constructor_staticAssocByReference(pAnimAssociationInterface, staticAnimAssociationInterface);
 
-		CAnimBlendStaticAssociation_FreeSequenceArray(&staticAnimAssociationInterface);
-	}
-	return pAnimAssociationInterface;
+        CAnimBlendStaticAssociation_FreeSequenceArray(&staticAnimAssociationInterface);
+    }
+    return pAnimAssociationInterface;
 }
 
 void _declspec(naked) HOOK_CAnimBlendAssocGroup_CopyAnimation()
@@ -79,21 +81,21 @@ void _declspec(naked) HOOK_CAnimBlendAssocGroup_CopyAnimation()
         {
             popad
 
-			push    esi
+            push    esi
 
             push    eax // animID
             push    ecx // pAnimAssocGroupInterface
             push    edi // pClump
-			call    CAnimBlendAssocGroup_CopyAnimation
-			add     esp, 0Ch
+            call    CAnimBlendAssocGroup_CopyAnimation
+            add     esp, 0Ch
 
             test    eax, eax
             jz      ERROR_CopyAnimation
 
             jmp     RETURN_CAnimBlendAssocGroup_CopyAnimation
 
-			ERROR_CopyAnimation:
-			jmp		RETURN_CAnimBlendAssocGroup_CopyAnimation_ERROR
+            ERROR_CopyAnimation:
+            jmp        RETURN_CAnimBlendAssocGroup_CopyAnimation_ERROR
         }
     }
 
diff --git a/Client/multiplayer_sa/CMultiplayerSA_HookDestructors.cpp b/Client/multiplayer_sa/CMultiplayerSA_HookDestructors.cpp
diff --git a/Client/sdk/game/CAnimBlendSequence.h b/Client/sdk/game/CAnimBlendSequence.h
diff --git a/Client/sdk/game/CAnimManager.h b/Client/sdk/game/CAnimManager.h

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ void CAnimBlendSequenceSA::SetKeyFrames(size_t cKeyFrames, bool bRoot, bool bCom`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`61`		`-void CAnimBlendSequenceSA::CopySequenceProperties( CAnimBlendSequenceSAInterface * pAnimSequenceInterface )`
	`61`	`+void CAnimBlendSequenceSA::CopySequenceProperties(CAnimBlendSequenceSAInterface* pAnimSequenceInterface)`
`62`	`62`	`{`
`63`	`63`	`m_pInterface = pAnimSequenceInterface;`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3965,7 +3965,7 @@ bool CClientGame::AssocGroupCopyAnimationHandler(CAnimBlendStaticAssociationSAIn`
`3965`	`3965`	`{`
`3966`	`3966`	`bool isCustomAnimationToPlay = false;`
`3967`	`3967`	`CAnimManager* pAnimationManager = g_pGame->GetAnimManager();`
`3968`		`- auto pAnimAssocGroup = pAnimationManager->GetAnimBlendAssocGroup (pAnimAssocGroupInterface);`
	`3968`	`+ auto pAnimAssocGroup = pAnimationManager->GetAnimBlendAssocGroup(pAnimAssocGroupInterface);`
`3969`	`3969`	`auto pOriginalAnimStaticAssoc = pAnimationManager->GetAnimStaticAssociation(pAnimAssocGroup->GetGroupID(), animID);`
`3970`	`3970`	`auto pOriginalAnimHierarchyInterface = pOriginalAnimStaticAssoc->GetAnimHierachyInterface();`
`3971`	`3971`	`auto pOutAnimStaticAssoc = pAnimationManager->GetAnimStaticAssociation(pOutAnimStaticAssocInterface);`
`@@ -6790,7 +6790,7 @@ void CClientGame::InsertIFPPointerToMap(const unsigned int u32BlockNameHash, con`
`6790`	`6790`
`6791`	`6791`	`std::shared_ptr<CClientIFP> CClientGame::GetIFPPointerFromMap(const unsigned int u32BlockNameHash)`
`6792`	`6792`	`{`
`6793`		`- auto it = m_mapOfIfpPointers.find(u32BlockNameHash);`
	`6793`	`+ auto it = m_mapOfIfpPointers.find(u32BlockNameHash);`
`6794`	`6794`	`if (it != m_mapOfIfpPointers.end())`
`6795`	`6795`	`{`
`6796`	`6796`	`return it->second;`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ void CClientIFP::ReadIFPVersion2(bool bAnp3)`
`108`	`108`	`WORD CClientIFP::ReadSequencesWithDummies(std::unique_ptr<CAnimBlendHierarchy>& pAnimationHierarchy)`
`109`	`109`	`{`
`110`	`110`	`SequenceMapType MapOfSequences;`
`111`		`- WORD wUnknownSequences = ReadSequences(pAnimationHierarchy, MapOfSequences);`
	`111`	`+ WORD wUnknownSequences = ReadSequences(pAnimationHierarchy, MapOfSequences);`
`112`	`112`
`113`	`113`	`MoveSequencesWithDummies(pAnimationHierarchy, MapOfSequences);`
`114`	`114`	`WORD cSequences = m_kcIFPSequences + wUnknownSequences;`
`@@ -140,30 +140,30 @@ WORD CClientIFP::ReadSequencesVersion1(std::unique_ptr<CAnimBlendHierarchy>& pAn`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`std::unique_ptr<CAnimBlendSequence> pAnimationSequence;`
`143`		`- bool bUnknownSequence = iBoneID == eBoneType::UNKNOWN;`
	`143`	`+ bool bUnknownSequence = iBoneID == eBoneType::UNKNOWN;`
`144`	`144`	`if (bUnknownSequence)`
`145`	`145`	`{`
`146`	`146`	`size_t UnkownSequenceIndex = m_kcIFPSequences + wUnknownSequences;`
`147`		`- auto pAnimationSequenceInterface = pAnimationHierarchy->GetSequence(UnkownSequenceIndex);`
	`147`	`+ auto pAnimationSequenceInterface = pAnimationHierarchy->GetSequence(UnkownSequenceIndex);`
`148`	`148`	`pAnimationSequence = m_pAnimManager->GetCustomAnimBlendSequence(pAnimationSequenceInterface);`
`149`	`149`	`wUnknownSequences++;`
`150`	`150`	`}`
`151`	`151`	`else`
`152`		`- {`
	`152`	`+ {`
`153`	`153`	`pAnimationSequence = m_pAnimManager->GetCustomAnimBlendSequence();`
`154`	`154`	`}`
`155`	`155`	`InitializeAnimationSequence(pAnimationSequence, Anim.Name, iBoneID);`
`156`	`156`
`157`	`157`	`eFrameType iFrameType = ReadKfrm();`
`158`	`158`	`if ((ReadSequenceKeyFrames(pAnimationSequence, iFrameType, Anim.Frames)) && (!bUnknownSequence))`
`159`	`159`	`{`
`160`		`- MapOfSequences[iBoneID] = std::move (pAnimationSequence);`
	`160`	`+ MapOfSequences[iBoneID] = std::move(pAnimationSequence);`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`	`return wUnknownSequences;`
`164`	`164`	`}`
`165`	`165`
`166`		`-WORD CClientIFP::ReadSequencesVersion2(std::unique_ptr<CAnimBlendHierarchy>& pAnimationHierarchy,SequenceMapType& MapOfSequences)`
	`166`	`+WORD CClientIFP::ReadSequencesVersion2(std::unique_ptr<CAnimBlendHierarchy>& pAnimationHierarchy, SequenceMapType& MapOfSequences)`
`167`	`167`	`{`
`168`	`168`	`WORD wUnknownSequences = 0;`
`169`	`169`	`for (size_t SequenceIndex = 0; SequenceIndex < pAnimationHierarchy->GetNumSequences(); SequenceIndex++)`
`@@ -177,7 +177,7 @@ WORD CClientIFP::ReadSequencesVersion2(std::unique_ptr<CAnimBlendHierarchy>& pAn`
`177`	`177`	`if (bUnknownSequence)`
`178`	`178`	`{`
`179`	`179`	`size_t UnkownSequenceIndex = m_kcIFPSequences + wUnknownSequences;`
`180`		`- auto pAnimationSequenceInterface = pAnimationHierarchy->GetSequence(UnkownSequenceIndex);`
	`180`	`+ auto pAnimationSequenceInterface = pAnimationHierarchy->GetSequence(UnkownSequenceIndex);`
`181`	`181`	`pAnimationSequence = m_pAnimManager->GetCustomAnimBlendSequence(pAnimationSequenceInterface);`
`182`	`182`	`wUnknownSequences++;`
`183`	`183`	`}`
`@@ -451,13 +451,13 @@ void CClientIFP::MoveSequencesWithDummies(std::unique_ptr<CAnimBlendHierarchy>&`
`451`	`451`
`452`	`452`	`auto pAnimationSequenceInterface = pAnimationHierarchy->GetSequence(SequenceIndex);`
`453`	`453`	`auto pAnimationSequence = m_pAnimManager->GetCustomAnimBlendSequence(pAnimationSequenceInterface);`
`454`		`- auto it = mapOfSequences.find(BoneID);`
	`454`	`+ auto it = mapOfSequences.find(BoneID);`
`455`	`455`	`if (it != mapOfSequences.end())`
`456`	`456`	`{`
`457`	`457`	`auto pMapAnimSequenceInterface = it->second->GetInterface();`
`458`		`- pAnimationSequence->CopySequenceProperties (pMapAnimSequenceInterface);`
	`458`	`+ pAnimationSequence->CopySequenceProperties(pMapAnimSequenceInterface);`
`459`	`459`	`// Delete the interface because we are moving, not copying`
`460`		`- delete pMapAnimSequenceInterface;`
	`460`	`+ m_pAnimManager->DeleteCustomAnimSequenceInterface(pMapAnimSequenceInterface);`
`461`	`461`	`}`
`462`	`462`	`else`
`463`	`463`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6062,7 +6062,7 @@ void CClientPed::RestoreAnimations(const std::shared_ptr<CClientIFP>& IFP)`
`6062`	`6062`
`6063`	`6063`	`void CClientPed::RestoreAnimations(CAnimBlock& animationBlock)`
`6064`	`6064`	`{`
`6065`		`- const size_t cAnimations = animationBlock.GetAnimationCount();`
	`6065`	`+ const size_t cAnimations = animationBlock.GetAnimationCount();`
`6066`	`6066`	`for (size_t i = 0; i < cAnimations; i++)`
`6067`	`6067`	`{`
`6068`	`6068`	`auto pAnimHierarchyInterface = animationBlock.GetAnimationHierarchyInterface(i);`