BlendAnimation hook has been changed to BlendAnimation_Hierarchy hook because that is only triggered when setPedAnimation is called. Commented AddAnimation hook for now, it can be used for engineRestoreAnimation and engineReplaceAnimation along with AddAnimationAndSync hook

Author: codenulls

Client/multiplayer_sa/CMultiplayerSA.cpp

@@ -636,7 +636,7 @@ void CMultiplayerSA::InitHooks()
     HookInstall(HOOKPOS_CGame_Process, (DWORD)HOOK_CGame_Process, 10 );
     HookInstall(HOOKPOS_Idle, (DWORD)HOOK_Idle, 10 );
     HookInstall(HOOKPOS_CEventHandler_ComputeKnockOffBikeResponse, (DWORD)HOOK_CEventHandler_ComputeKnockOffBikeResponse, 7 );
-    HookInstall(HOOKPOS_CAnimManager_AddAnimation, (DWORD)HOOK_CAnimManager_AddAnimation, 10 ); 
+    //HookInstall(HOOKPOS_CAnimManager_AddAnimation, (DWORD)HOOK_CAnimManager_AddAnimation, 10 ); 
     HookInstall(HOOKPOS_CAnimManager_AddAnimationAndSync, (DWORD)HOOK_CAnimManager_AddAnimationAndSync, 10 ); 
     HookInstall(HOOKPOS_CAnimManager_BlendAnimation_Hierarchy, (DWORD)HOOK_CAnimManager_BlendAnimation_Hierarchy, 7 );
     HookInstall(HOOKPOS_CPed_GetWeaponSkill, (DWORD)HOOK_CPed_GetWeaponSkill, 8 );
@@ -5426,6 +5426,7 @@ void _declspec(naked) HOOK_CAnimManager_AddAnimationAndSync ()
     } 
 }
 
+#include <../game_sa/CAnimBlendHierarchySA.h> // ---------------- REMOVE THIS LATER
 
 CAnimBlendHierarchySAInterface * pAnimHierarchy = nullptr;
 int   flags = 0;
@@ -5444,15 +5445,19 @@ void _declspec(naked) HOOK_CAnimManager_BlendAnimation_Hierarchy ()
         mov     animationBlendDelta, eax
         pushad
     }
-    
+
     if ( m_pBlendAnimationHandler  )
     {
-        m_pBlendAnimationHandler ( animationClump, pAnimHierarchy, flags, animationBlendDelta );
+        pAnimHierarchy = m_pBlendAnimationHandler ( animationClump, pAnimHierarchy, flags, animationBlendDelta );
     }
 
+    printf ("BlendAnimation_Hierarchy_Hook, pAnimHierarchy->usNumSequences: %d\n\n", pAnimHierarchy->usNumSequences);
+
     _asm
     {
         popad
+        mov    eax, pAnimHierarchy  
+        mov    [esp+8], eax
         push   0FFFFFFFFh
         push   04D4410h
         jmp    RETURN_CAnimManager_BlendAnimation_Hierarchy