Fix CAnimBlendStaticAssociation::Init crash

codenulls · codenulls · commit 1d37c73735c9 · 2018-07-06T09:38:28.000+05:00
CAnimBlendStaticAssociation::Init was being called by CClientGame::AssocGroupCopyAnimationHandler whenever an animation was being played, for some reason, it crashed due to faulty animation(animation sequences not initialized properly). I removed the call to CAnimBlendStaticAssociation::Init, and used two different constructors of CAnimBlendAssociation, one when there is no animation replaced, the other constructor is called for replaced animations. (reverted from commit c7ed932)
diff --git a/Client/game_sa/CAnimBlendAssociationSA.cpp b/Client/game_sa/CAnimBlendAssociationSA.cpp
@@ -13,31 +13,6 @@
 
 extern CGameSA* pGame;
 
-CAnimBlendAssociationSAInterface* CAnimBlendAssociationSA::Constructor(CAnimBlendStaticAssociationSAInterface& staticAssociationByReference)
-{
-    DWORD DwFunc = 0x4CF080;
-    DWORD DwThisInterface = reinterpret_cast<DWORD>(m_pInterface);
-    _asm
-    {
-        mov     ecx, DwThisInterface
-        push    staticAssociationByReference
-        call    DwFunc
-    };
-}
-
-CAnimBlendAssociationSAInterface* CAnimBlendAssociationSA::Constructor(RpClump* pClump, CAnimBlendHierarchySAInterface* pAnimHierarchy)
-{
-    DWORD DwFunc = 0x4CEFC0;
-    DWORD DwThisInterface = reinterpret_cast<DWORD>(m_pInterface);
-    _asm
-    {
-        mov     ecx, DwThisInterface
-        push    pAnimHierarchy
-        push    pClump
-        call    DwFunc
-    };
-}
-
 CAnimBlendHierarchy* CAnimBlendAssociationSA::GetAnimHierarchy(void)
 {
     return pGame->GetAnimManager()->GetAnimBlendHierarchy(m_pInterface->pAnimHierarchy);
@@ -55,4 +30,4 @@ void CAnimBlendAssociationSA::SetCurrentProgress(float fProgress)
         push    fTime
         call    DwFunc
     };
-}
+}
diff --git a/Client/game_sa/CAnimBlendAssociationSA.h b/Client/game_sa/CAnimBlendAssociationSA.h
@@ -45,19 +45,15 @@ class CAnimBlendAssociationSA : public CAnimBlendAssociation
 public:
     CAnimBlendAssociationSA(CAnimBlendAssociationSAInterface* pInterface) { m_pInterface = pInterface; }
 
-    CAnimBlendAssociationSAInterface* Constructor(CAnimBlendStaticAssociationSAInterface& StaticAssociationByReference);
-    CAnimBlendAssociationSAInterface* Constructor(RpClump* pClump, CAnimBlendHierarchySAInterface* pAnimHierarchy);
     CAnimBlendAssociationSAInterface* GetInterface(void) { return m_pInterface; }
     AssocGroupId                      GetAnimGroup(void) { return (AssocGroupId)m_pInterface->sAnimGroup; }
     AnimationId                       GetAnimID(void) { return (AnimationId)m_pInterface->sAnimID; }
     CAnimBlendHierarchy*              GetAnimHierarchy(void);
 
     float GetBlendAmount(void) { return m_pInterface->fBlendAmount; }
     void  SetBlendAmount(float fAmount) { m_pInterface->fBlendAmount = fAmount; }
-    void  SetCurrentProgress(float fProgress);
-    void  SetAnimID(short sAnimID) { m_pInterface->sAnimID = sAnimID; }
-    void  SetAnimGroup(short sAnimGroup) { m_pInterface->sAnimGroup = sAnimGroup; }
-    void  SetFlags(short sFlags) { m_pInterface->sFlags = sFlags; }
+
+    void SetCurrentProgress(float fProgress);
 
 protected:
     CAnimBlendAssociationSAInterface* m_pInterface;
diff --git a/Client/game_sa/CAnimBlendStaticAssociationSA.h b/Client/game_sa/CAnimBlendStaticAssociationSA.h
@@ -47,12 +47,11 @@ class CAnimBlendStaticAssociationSA : public CAnimBlendStaticAssociation
     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; }
-    CAnimBlendStaticAssociationSAInterface* GetInterface(void) { return m_pInterface; }
+    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
@@ -749,11 +749,6 @@ CAnimBlendHierarchy* CAnimManagerSA::GetAnimBlendHierarchy(CAnimBlendHierarchySA
     return NULL;
 }
 
-std::unique_ptr<CAnimBlendAssociation> CAnimManagerSA::GetAnimBlendAssociation2(CAnimBlendAssociationSAInterface* pInterface)
-{
-    return std::make_unique<CAnimBlendAssociationSA>(pInterface);
-}
-
 CAnimManagerSA::StaticAssocIntface_type CAnimManagerSA::GetAnimStaticAssociation(CAnimBlendStaticAssociationSAInterface* pInterface)
 {
     return std::make_unique<CAnimBlendStaticAssociationSA>(pInterface);
diff --git a/Client/game_sa/CAnimManagerSA.h b/Client/game_sa/CAnimManagerSA.h
@@ -153,8 +153,7 @@ class CAnimManagerSA : public CAnimManager
     CAnimBlock*            GetAnimBlock(CAnimBlockSAInterface* pInterface);
     CAnimBlendHierarchy*   GetAnimBlendHierarchy(CAnimBlendHierarchySAInterface* pInterface);
 
-    std::unique_ptr<CAnimBlendAssociation> GetAnimBlendAssociation2(CAnimBlendAssociationSAInterface* pInterface);
-    StaticAssocIntface_type                GetAnimStaticAssociation(CAnimBlendStaticAssociationSAInterface* pInterface);
+    StaticAssocIntface_type GetAnimStaticAssociation(CAnimBlendStaticAssociationSAInterface* pInterface);
 
     // MTA members, but use this strictly for custom animations only
     std::unique_ptr<CAnimBlendHierarchy> GetCustomAnimBlendHierarchy(CAnimBlendHierarchySAInterface* pInterface);
diff --git a/Client/mods/deathmatch/logic/CClientGame.cpp b/Client/mods/deathmatch/logic/CClientGame.cpp
@@ -3647,10 +3647,11 @@ CAnimBlendAssociationSAInterface* CClientGame::StaticAddAnimationAndSyncHandler(
     return g_pClientGame->AddAnimationAndSyncHandler(pClump, pAnimAssocToSyncWith, animGroup, animID);
 }
 
-bool CClientGame::StaticAssocGroupCopyAnimationHandler(CAnimBlendAssociationSAInterface* pAnimAssoc, RpClump* pClump,
+bool CClientGame::StaticAssocGroupCopyAnimationHandler(CAnimBlendStaticAssociationSAInterface* pOutAnimStaticAssoc,
+                                                       CAnimBlendAssociationSAInterface* pAnimAssoc, RpClump* pClump,
                                                        CAnimBlendAssocGroupSAInterface* pAnimAssocGroup, AnimationId animID)
 {
-    return g_pClientGame->AssocGroupCopyAnimationHandler(pAnimAssoc, pClump, pAnimAssocGroup, animID);
+    return g_pClientGame->AssocGroupCopyAnimationHandler(pOutAnimStaticAssoc, pAnimAssoc, pClump, pAnimAssocGroup, animID);
 }
 
 bool CClientGame::StaticBlendAnimationHierarchyHandler(CAnimBlendAssociationSAInterface* pAnimAssoc, CAnimBlendHierarchySAInterface** pOutAnimHierarchy,
@@ -3958,44 +3959,38 @@ CAnimBlendAssociationSAInterface* CClientGame::AddAnimationAndSyncHandler(RpClum
     return nullptr;
 }
 
-bool CClientGame::AssocGroupCopyAnimationHandler(CAnimBlendAssociationSAInterface* pAnimAssocInterface, RpClump* pClump,
+bool CClientGame::AssocGroupCopyAnimationHandler(CAnimBlendStaticAssociationSAInterface* pOutAnimStaticAssocInterface,
+                                                 CAnimBlendAssociationSAInterface* pAnimAssoc, RpClump* pClump,
                                                  CAnimBlendAssocGroupSAInterface* pAnimAssocGroupInterface, AnimationId animID)
 {
     bool          isCustomAnimationToPlay = false;
     CAnimManager* pAnimationManager = g_pGame->GetAnimManager();
     auto          pAnimAssocGroup = pAnimationManager->GetAnimBlendAssocGroup(pAnimAssocGroupInterface);
     auto          pOriginalAnimStaticAssoc = pAnimationManager->GetAnimStaticAssociation(pAnimAssocGroup->GetGroupID(), animID);
     auto          pOriginalAnimHierarchyInterface = pOriginalAnimStaticAssoc->GetAnimHierachyInterface();
-    auto          pAnimAssociation = pAnimationManager->GetAnimBlendAssociation2(pAnimAssocInterface);
-
-    CClientPed* pClientPed = GetClientPedByClump(*pClump);
+    auto          pOutAnimStaticAssoc = pAnimationManager->GetAnimStaticAssociation(pOutAnimStaticAssocInterface);
+    CClientPed*   pClientPed = GetClientPedByClump(*pClump);
     if (pClientPed != nullptr)
     {
         auto pReplacedAnimation = pClientPed->GetReplacedAnimation(pOriginalAnimHierarchyInterface);
         if (pReplacedAnimation != nullptr)
         {
             std::shared_ptr<CIFPAnimations> pIFPAnimations = pReplacedAnimation->pIFP->GetIFPAnimationsPointer();
-            InsertAnimationAssociationToMap(pAnimAssocInterface, pIFPAnimations);
+            InsertAnimationAssociationToMap(pAnimAssoc, pIFPAnimations);
 
             // Play our custom animation instead of default
-            auto pAnimHierarchy = pAnimationManager->GetCustomAnimBlendHierarchy(pReplacedAnimation->pAnimationHierarchy);
-            pAnimationManager->UncompressAnimation(pAnimHierarchy.get());
-            pAnimAssociation->Constructor(pClump, pAnimHierarchy->GetInterface());
-            pAnimAssociation->SetFlags(pOriginalAnimStaticAssoc->GetFlags());
-            pAnimAssociation->SetAnimID(pOriginalAnimStaticAssoc->GetAnimID());
-            pAnimAssociation->SetAnimGroup(pOriginalAnimStaticAssoc->GetAnimGroup());
+            pOutAnimStaticAssoc->Initialize(pClump, pReplacedAnimation->pAnimationHierarchy);
             isCustomAnimationToPlay = true;
         }
     }
 
     if (!isCustomAnimationToPlay)
     {
-        auto pAnimHierarchy = pAnimationManager->GetAnimBlendHierarchy(pOriginalAnimHierarchyInterface);
-
         // Play default internal animation
-        pAnimationManager->UncompressAnimation(pAnimHierarchy);
-        pAnimAssociation->Constructor(*pOriginalAnimStaticAssoc->GetInterface());
+        pOutAnimStaticAssoc->Initialize(pClump, pOriginalAnimHierarchyInterface);
     }
+
+    CopyStaticAssociationProperties(pOutAnimStaticAssoc, pOriginalAnimStaticAssoc);
     return isCustomAnimationToPlay;
 }
 
@@ -6777,6 +6772,17 @@ void CClientGame::RestreamModel(unsigned short usModel)
         m_pManager->GetVehicleManager()->RestreamVehicleUpgrades(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)
 {
     m_mapOfIfpPointers[u32BlockNameHash] = pIFP;
diff --git a/Client/mods/deathmatch/logic/CClientGame.h b/Client/mods/deathmatch/logic/CClientGame.h
@@ -503,8 +503,8 @@ class CClientGame
     static CAnimBlendAssociationSAInterface* StaticAddAnimationHandler(RpClump* pClump, AssocGroupId animGroup, AnimationId animID);
     static CAnimBlendAssociationSAInterface* StaticAddAnimationAndSyncHandler(RpClump* pClump, CAnimBlendAssociationSAInterface* pAnimAssocToSyncWith,
                                                                               AssocGroupId animGroup, AnimationId animID);
-    static bool                              StaticAssocGroupCopyAnimationHandler(CAnimBlendAssociationSAInterface* pAnimAssoc, RpClump* pClump,
-                                                                                  CAnimBlendAssocGroupSAInterface* pAnimAssocGroup, AnimationId animID);
+    static bool StaticAssocGroupCopyAnimationHandler(CAnimBlendStaticAssociationSAInterface* pOutAnimStaticAssoc, CAnimBlendAssociationSAInterface* pAnimAssoc,
+                                                     RpClump* pClump, CAnimBlendAssocGroupSAInterface* pAnimAssocGroup, AnimationId animID);
     static bool StaticBlendAnimationHierarchyHandler(CAnimBlendAssociationSAInterface* pAnimAssoc, CAnimBlendHierarchySAInterface** pOutAnimHierarchy,
                                                      int* pFlags, RpClump* pClump);
     static bool StaticProcessCollisionHandler(CEntitySAInterface* pThisInterface, CEntitySAInterface* pOtherInterface);
@@ -543,8 +543,8 @@ class CClientGame
     CAnimBlendAssociationSAInterface* AddAnimationHandler(RpClump* pClump, AssocGroupId animGroup, AnimationId animID);
     CAnimBlendAssociationSAInterface* AddAnimationAndSyncHandler(RpClump* pClump, CAnimBlendAssociationSAInterface* pAnimAssocToSyncWith,
                                                                  AssocGroupId animGroup, AnimationId animID);
-    bool        AssocGroupCopyAnimationHandler(CAnimBlendAssociationSAInterface* pAnimAssoc, RpClump* pClump, CAnimBlendAssocGroupSAInterface* pAnimAssocGroup,
-                                               AnimationId animID);
+    bool        AssocGroupCopyAnimationHandler(CAnimBlendStaticAssociationSAInterface* pOutAnimStaticAssoc, CAnimBlendAssociationSAInterface* pAnimAssoc,
+                                               RpClump* pClump, CAnimBlendAssocGroupSAInterface* pAnimAssocGroup, AnimationId animID);
     bool        BlendAnimationHierarchyHandler(CAnimBlendAssociationSAInterface* pAnimAssoc, CAnimBlendHierarchySAInterface** pOutAnimHierarchy, int* pFlags,
                                                RpClump* pClump);
     bool        ProcessCollisionHandler(CEntitySAInterface* pThisInterface, CEntitySAInterface* pOtherInterface);
@@ -601,6 +601,8 @@ 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/multiplayer_sa/CMultiplayerSA.h b/Client/multiplayer_sa/CMultiplayerSA.h
@@ -40,8 +40,13 @@ enum eRadioStationID
     WCTR,
 };
 
+typedef void(__thiscall* hCAnimBlendStaticAssociation_FreeSequenceArray)(CAnimBlendStaticAssociationSAInterface* pThis);
+typedef void(__cdecl* hUncompressAnimation)(CAnimBlendHierarchySAInterface* pAnimBlendHierarchyInterface);
 typedef void*(__cdecl* hCAnimBlendAssociation_NewOperator)(size_t iSizeInBytes);
 
+typedef CAnimBlendAssociationSAInterface*(__thiscall* hCAnimBlendAssociation_Constructor_staticAssocByReference)(
+    CAnimBlendAssociationSAInterface* pThis, CAnimBlendStaticAssociationSAInterface& StaticAssociationByReference);
+
 class CMultiplayerSA : public CMultiplayer
 {
     friend class COffsetsMP;
diff --git a/Client/multiplayer_sa/CMultiplayerSA_CustomAnimations.cpp b/Client/multiplayer_sa/CMultiplayerSA_CustomAnimations.cpp
@@ -26,6 +26,10 @@ DWORD RETURN_CAnimManager_AddAnimation = 0x4D3AB1;
 DWORD RETURN_CAnimManager_AddAnimationAndSync = 0x4D3B41;
 DWORD RETURN_CAnimManager_BlendAnimation_Hierarchy = 0x4D4577;
 
+auto CAnimBlendStaticAssociation_FreeSequenceArray = (hCAnimBlendStaticAssociation_FreeSequenceArray)0x4ce9a0;
+auto UncompressAnimation = (hUncompressAnimation)0x4d41c0;
+auto CAnimBlendAssociation_Constructor_staticAssocByReference = (hCAnimBlendAssociation_Constructor_staticAssocByReference)0x4CF080;
+
 auto CAnimBlendAssociation_NewOperator_US = (hCAnimBlendAssociation_NewOperator)0x82119A;
 auto CAnimBlendAssociation_NewOperator_EU = (hCAnimBlendAssociation_NewOperator)0x8211DA;
 
@@ -66,7 +70,15 @@ CAnimBlendAssociationSAInterface* __cdecl CAnimBlendAssocGroup_CopyAnimation(RpC
 
     if (pAnimAssociationInterface)
     {
-        m_pAssocGroupCopyAnimationHandler(pAnimAssociationInterface, pClump, pAnimAssocGroupInterface, animID);
+        CAnimBlendStaticAssociationSAInterface staticAnimAssociationInterface;
+
+        m_pAssocGroupCopyAnimationHandler(&staticAnimAssociationInterface, pAnimAssociationInterface, pClump, pAnimAssocGroupInterface, animID);
+
+        UncompressAnimation(staticAnimAssociationInterface.pAnimHeirarchy);
+
+        CAnimBlendAssociation_Constructor_staticAssocByReference(pAnimAssociationInterface, staticAnimAssociationInterface);
+
+        CAnimBlendStaticAssociation_FreeSequenceArray(&staticAnimAssociationInterface);
     }
     return pAnimAssociationInterface;
 }
diff --git a/Client/sdk/game/CAnimBlendAssociation.h b/Client/sdk/game/CAnimBlendAssociation.h
@@ -13,29 +13,22 @@
 #define __CAnimBlendAssociation_H
 
 class CAnimBlendAssociationSAInterface;
-class CAnimBlendStaticAssociationSAInterface;
 typedef unsigned long AssocGroupId;
 typedef unsigned long AnimationId;
 class CAnimBlendHierarchy;
-class CAnimBlendHierarchySAInterface;
-struct RpClump;
 
 class CAnimBlendAssociation
 {
 public:
-    virtual CAnimBlendAssociationSAInterface* Constructor(CAnimBlendStaticAssociationSAInterface& StaticAssociationByReference) = 0;
-    virtual CAnimBlendAssociationSAInterface* Constructor(RpClump* pClump, CAnimBlendHierarchySAInterface* pAnimHierarchy) = 0;
     virtual CAnimBlendAssociationSAInterface* GetInterface(void) = 0;
     virtual AssocGroupId                      GetAnimGroup(void) = 0;
     virtual AnimationId                       GetAnimID(void) = 0;
     virtual CAnimBlendHierarchy*              GetAnimHierarchy(void) = 0;
 
     virtual float GetBlendAmount(void) = 0;
     virtual void  SetBlendAmount(float fAmount) = 0;
-    virtual void  SetCurrentProgress(float fProgress) = 0;
-    virtual void  SetAnimID(short sAnimID) = 0;
-    virtual void  SetAnimGroup(short sAnimGroup) = 0;
-    virtual void  SetFlags(short sFlags) = 0;
+
+    virtual void SetCurrentProgress(float fProgress) = 0;
 };
 
 #endif
diff --git a/Client/sdk/game/CAnimBlendStaticAssociation.h b/Client/sdk/game/CAnimBlendStaticAssociation.h
@@ -14,7 +14,6 @@
 
 struct RpClump;
 class CAnimBlendHierarchySAInterface;
-class CAnimBlendStaticAssociationSAInterface;
 
 class CAnimBlendStaticAssociation
 {
@@ -25,12 +24,11 @@ class CAnimBlendStaticAssociation
     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;
-    virtual CAnimBlendStaticAssociationSAInterface* GetInterface(void) = 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
@@ -47,7 +47,6 @@ class CAnimManager
     friend class CAnimBlendAssociation;
 
 public:
-    typedef std::unique_ptr<CAnimBlendAssociation>       AnimBlendAssoc_type;
     typedef std::unique_ptr<CAnimBlendStaticAssociation> StaticAssocIntface_type;
 
     virtual void Initialize(void) = 0;
@@ -118,7 +117,6 @@ class CAnimManager
     virtual CAnimBlock*            GetAnimBlock(CAnimBlockSAInterface* pInterface) = 0;
     virtual CAnimBlendHierarchy*   GetAnimBlendHierarchy(CAnimBlendHierarchySAInterface* pInterface) = 0;
 
-    virtual AnimBlendAssoc_type     GetAnimBlendAssociation2(CAnimBlendAssociationSAInterface* pInterface) = 0;
     virtual StaticAssocIntface_type GetAnimStaticAssociation(CAnimBlendStaticAssociationSAInterface* pInterface) = 0;
 
     // MTA members, but use this strictly for custom animations only
diff --git a/Client/sdk/multiplayer/CMultiplayer.h b/Client/sdk/multiplayer/CMultiplayer.h

Original file line number	Diff line number	Diff line change
`@@ -749,11 +749,6 @@ CAnimBlendHierarchy* CAnimManagerSA::GetAnimBlendHierarchy(CAnimBlendHierarchySA`
`749`	`749`	`return NULL;`
`750`	`750`	`}`
`751`	`751`
`752`		`-std::unique_ptr<CAnimBlendAssociation> CAnimManagerSA::GetAnimBlendAssociation2(CAnimBlendAssociationSAInterface* pInterface)`
`753`		`-{`
`754`		`- return std::make_unique<CAnimBlendAssociationSA>(pInterface);`
`755`		`-}`
`756`		`-`
`757`	`752`	`CAnimManagerSA::StaticAssocIntface_type CAnimManagerSA::GetAnimStaticAssociation(CAnimBlendStaticAssociationSAInterface* pInterface)`
`758`	`753`	`{`
`759`	`754`	`return std::make_unique<CAnimBlendStaticAssociationSA>(pInterface);`