[FIX] Fixed AddAnimation hook and disabled AddAnimationAndSync hook.

I used Original code for AddAnimation hook in CClientGame::AddAnimationHandler. It works well. Now, it's time to create our own CAnimBlendAssociationSAInterface instead of using CopyAnimation. I'll need to enable AddAnimationAndSync hook as well because this is called for almost every internal GTA animation.

Author: codenulls

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -3989,96 +3989,65 @@ CAnimBlendAssociationSAInterface * CClientGame::AddAnimationHandler ( RpClump *
 {
     printf ( "AddAnimationHandler called! pClump, GroupID, AnimID: %p, %d, %d\n", (void*)pClump, animGroup, animID );
 
-    CClientPed * pClientPed =  GetClientPedByClump ( *pClump ); //pAnimationManager->GetPedPointerFromMap ( pClump ); //m_pRootEntity->GetClientPedByClump ( *pClump );
-    if ( pClientPed != nullptr )
-    {
-        //pClientPed->setCurrentAnimationCustom ( false );
-    }
-/*
     hCAnimBlendAssocGroup_CopyAnimation CAnimBlendAssocGroup_CopyAnimation   = (hCAnimBlendAssocGroup_CopyAnimation)0x004CE130;
     hUncompressAnimation                 UncompressAnimation                 = (hUncompressAnimation)0x4d41c0;
     hCAnimBlendAssoc_Constructor_staticAssocRef OLD_CAnimBlendAssoc_Constructor_staticAssocRef = (hCAnimBlendAssoc_Constructor_staticAssocRef)0x4CF080;
     hCAnimBlendStaticAssoc_Constructor OLD_CAnimBlendStaticAssoc_Constructor = *(hCAnimBlendStaticAssoc_Constructor)0x4CE940;
     hCAnimBlendStaticAssoc_Init        OLD_CAnimBlendStaticAssoc_Init = (hCAnimBlendStaticAssoc_Init)0x004CEC20;
-
-    CAnimManager * pAnimationManager = g_pGame->GetAnimManager();
-    auto pOriginalAnimStaticAssoc = pAnimationManager->GetAnimStaticAssociation ( animGroup, animID );
-
-    CClientPed * pClientPed = pAnimationManager->GetPedPointerFromMap ( pClump );
-    if ( pClientPed != nullptr )
-    {
-        printf("AddAnimationHandler: found client ped pointer from map\n");
-
-        const SString & strBlockName = pClientPed->GetNextAnimationCustomBlockName ( );
-        CClientIFP * pIFP = GetIFPPointerFromMap ( strBlockName );
-        if ( pIFP )
-        { 
-            printf("AddAnimationHandler: found IFP pointer from map\n");
-
-            const SString & strAnimationName = pClientPed->GetNextAnimationCustomName ( );
-            _CAnimBlendHierarchy * pCustomAnimBlendHierarchy = (_CAnimBlendHierarchy *)pIFP->GetAnimationHierarchy ( strAnimationName );
-            if ( pCustomAnimBlendHierarchy != nullptr )
-            { 
-                printf("AddAnimationHandler:got custom animation hierarchy\n");
-                
-                if (  animGroup == 0 && animID == 55 ) // if it's crouch animation
-                {
-                    printf("AddAnimationHandler: Internal GTA Courch Animation Total Sequences: %d\n", pOriginalAnimStaticAssoc->pAnimHeirarchy->usNumSequences);
-
-            
-                    auto pCrouchAnimStaticAssoc = pAnimationManager->GetAnimStaticAssociation ( 0, 55 ); // 0, 55 for crouch animation
-            
-                    CAnimBlendStaticAssoc * pOriginalAnimStaticAssoc = (CAnimBlendStaticAssoc *)pCrouchAnimStaticAssoc;
-
-                    // let's play the original crouch animation instead for testing ^^
-                    pCustomAnimBlendHierarchy = pOriginalAnimStaticAssoc->m_pAnimBlendHier;
-
-                    pCustomAnimBlendHierarchy->m_hashKey      = pOriginalAnimStaticAssoc->m_pAnimBlendHier->m_hashKey;
-                    pCustomAnimBlendHierarchy->m_nAnimBlockId = pOriginalAnimStaticAssoc->m_pAnimBlendHier->m_nAnimBlockId;
-                
-                    CAnimBlendStaticAssoc CustomAnimStaticAssoc;
-                    OLD_CAnimBlendStaticAssoc_Constructor ( &CustomAnimStaticAssoc );
-
-                    CustomAnimStaticAssoc.m_nFlags = pOriginalAnimStaticAssoc->m_nFlags;
-
-                    OLD_CAnimBlendStaticAssoc_Init ( &CustomAnimStaticAssoc, pClump, pCustomAnimBlendHierarchy);
-
-                    CustomAnimStaticAssoc.m_nAnimGroup = pOriginalAnimStaticAssoc->m_nAnimGroup;
-                    CustomAnimStaticAssoc.m_nAnimID    = pOriginalAnimStaticAssoc->m_nAnimID;
-                    
-                    UncompressAnimation ( CustomAnimStaticAssoc.m_pAnimBlendHier );
-                    CAnimBlendAssoc * pAnimAssoc = (CAnimBlendAssoc *)malloc(sizeof(CAnimBlendAssoc));
-                    OLD_CAnimBlendAssoc_Constructor_staticAssocRef ( pAnimAssoc, CustomAnimStaticAssoc);
-                    
-                    pAnimAssoc->m_nAnimGroup = pOriginalAnimStaticAssoc->m_nAnimGroup;
-                    pAnimAssoc->m_nFlags     = pOriginalAnimStaticAssoc->m_nFlags;
-                    
-                    printf("AddAnimationHandler: returning pAnimAssoc\n");
-                    return (CAnimBlendAssociationSAInterface * ) pAnimAssoc;
-                    //auto pAnimStaticAssoc = pAnimationManager->GetAnimStaticAssociation ( 0, 55 ); // 0, 55 for crouch animation
-                    //return pAnimStaticAssoc->pAnimHeirarchy;
-                } 
-            }   
-            else
-            {
-                printf ("AddAnimationHandler: could not find IFP animation hierarchy '%s'\n", strAnimationName.c_str());
-            }
-        }
-        else
-        {
-            printf("AddAnimationHandler: could not find IFP block name '%s'\n", strBlockName.c_str());
-        }
-    }
-   
-    printf("AddAnimationHandler: executing normal flow instead of custom animation\n");
-*/
-    // normal flow
-    std::unique_ptr < CAnimBlendAssocGroup >    pAnimAssocGroup  = g_pGame->CreateAnimBlendAssocGroup ( animGroup );
-    CAnimBlendAssociationSAInterface         *  pAnimAssociation = pAnimAssocGroup->CopyAnimation ( animID );
-
-    printf("\n"); 
-
-    return pAnimAssociation;
+    hCAnimBlendAssoc_SyncAnimation CAnimBlendAssoc_SyncAnimation = (hCAnimBlendAssoc_SyncAnimation)0x004CEB40;
+    hCAnimBlendAssoc_Start         CAnimBlendAssoc_Start         = (hCAnimBlendAssoc_Start)0x004CEB70;
+
+  CAnimBlendAssoc * pAnimAssoc; // esi
+  int *clumpData; // edi
+  int *next; // eax
+  DWORD *tempAssoc; // eax
+  int *nextAssoc; // ecx
+                                                // We need to remove this line and add some code here for running animations simultaneously
+  pAnimAssoc = CAnimBlendAssocGroup_CopyAnimation((DWORD *) (*(DWORD*)0x00B4EA34) + 5 * animGroup, animID);
+
+  ////ofs << "Done calling  CAnimBlendAssocGroup_CopyAnimation " << std::endl;
+
+  clumpData = *(int **)(   (*(DWORD*)0xB5F878) + ((int)pClump));
+
+  if ( !((*((BYTE *)pAnimAssoc + 46) >> 5) & 1) )
+    goto LABEL_5;
+  next = (int *)*clumpData;
+  if ( !*clumpData )
+    goto LABEL_5;
+  while ( !((*((BYTE *)next + 42) >> 5) & 1) )
+  {
+    next = (int *)*next;
+    if ( !next )
+      goto LABEL_5;
+  }
+  if ( next )
+  {
+    CAnimBlendAssoc_SyncAnimation(pAnimAssoc, (CAnimBlendAssoc *)(next - 1));
+    *((BYTE *)pAnimAssoc + 46) |= 1u;
+  }
+  else
+  {
+LABEL_5:
+    CAnimBlendAssoc_Start(pAnimAssoc, 0);
+  }
+
+  tempAssoc = ((DWORD*)pAnimAssoc) + 1;
+
+  if ( *clumpData )                             // clumpData->nextAssoc
+    *(DWORD *)(*clumpData + 4) = (DWORD)tempAssoc;
+
+  nextAssoc = (int *)*clumpData;
+
+  DWORD * dwpAnimAssoc = (DWORD*) pAnimAssoc;
+
+  dwpAnimAssoc[2] = (DWORD)clumpData;
+  //pAnimAssoc[2] = clumpData;
+
+  *tempAssoc = (DWORD)nextAssoc;
+
+  *clumpData = (int)tempAssoc;
+
+    return (CAnimBlendAssociationSAInterface *)pAnimAssoc;
 }
 
 CAnimBlendHierarchySAInterface * CClientGame::BlendAnimationHandler ( RpClump * pClump, CAnimBlendHierarchySAInterface * pAnimHierarchy, int flags, float fBlendDelta )

Client/multiplayer_sa/CMultiplayerSA.cpp

@@ -156,7 +156,7 @@ DWORD RETURN_CPlantMgr_Render_fail =                        0x5DBDAA;
 DWORD RETURN_CEventHandler_ComputeKnockOffBikeResponse =    0x4BA076;
 
 #define HOOKPOS_CAnimManager_AddAnimation                   0x4d3aa0
-DWORD RETURN_CAnimManager_AddAnimation =                    0x4D3AAA;
+DWORD RETURN_CAnimManager_AddAnimation =                    0x004D3B16; //0x4D3AAA;
 DWORD RETURN_CAnimManager_AddAnimation_SkipCopyAnimation =  0x4D3ABC;
 
 #define HOOKPOS_CAnimManager_AddAnimationAndSync                  0x4D3B30
@@ -637,7 +637,7 @@ void CMultiplayerSA::InitHooks()
     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_AddAnimationAndSync, (DWORD)HOOK_CAnimManager_AddAnimationAndSync, 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 );
     HookInstall(HOOKPOS_CPed_AddGogglesModel, (DWORD)HOOK_CPed_AddGogglesModel, 6);
@@ -5354,20 +5354,8 @@ void _declspec(naked) HOOK_CAnimManager_AddAnimation ()
     {
         pAnimAssociation = m_pAddAnimationHandler ( animationClump, animationGroup, animationID );
     }
-    else 
-    {
-        // This will avoid crash if m_pAddAnimationHandler is removed
-        // continue the normal flow of AddAnimation function, instead of skipping CopyAnimation
-
-       _asm
-        {
-            popad
-            mov     eax,dword ptr [esp+0Ch] 
-            mov     edx,dword ptr ds:[0B4EA34h] 
-            jmp     RETURN_CAnimManager_AddAnimation
-        }
-    }
 
+/*
     // As we are manually creating animation association, so skip CopyAnimation call
     _asm
     {
@@ -5376,6 +5364,14 @@ void _declspec(naked) HOOK_CAnimManager_AddAnimation ()
         push    edi
         mov     eax, pAnimAssociation
         jmp     RETURN_CAnimManager_AddAnimation_SkipCopyAnimation
+    } */
+
+    // As we are manually creating animation association, so skip CopyAnimation call
+    _asm
+    {
+        popad
+        mov     eax, pAnimAssociation
+        jmp     RETURN_CAnimManager_AddAnimation
     } 
 }
 
@@ -5410,10 +5406,11 @@ void _declspec(naked) HOOK_CAnimManager_AddAnimationAndSync ()
             popad
             mov     eax,dword ptr [esp+0Ch] 
             mov     edx,dword ptr ds:[0B4EA34h] 
-            jmp     RETURN_CAnimManager_AddAnimation
+            jmp     RETURN_CAnimManager_AddAnimationAndSync
         }
     }
 
+    printf("HOOK_CAnimManager_AddAnimationAndSync:  m_nAnimGroup: %d  |  m_nAnimID: %d\n\n", pAnimAssociation->sAnimGroup, pAnimAssociation->sAnimID);
 
     // As we are manually creating animation association, so skip CopyAnimation call
     _asm
@@ -5422,7 +5419,7 @@ void _declspec(naked) HOOK_CAnimManager_AddAnimationAndSync ()
         push    esi
         push    edi
         mov     eax, pAnimAssociation
-        jmp     RETURN_CAnimManager_AddAnimation_SkipCopyAnimation
+        jmp     RETURN_CAnimManager_AddAnimationAndSync_SkipCopyAnimation 
     } 
 }