changed CAnimBlendAssociation * to CAnimBlendAssociationSAInterface *

Author: codenulls

Client/game_sa/CAnimBlendAssocGroupSA.cpp

@@ -19,9 +19,9 @@ CAnimBlendAssocGroupSA::CAnimBlendAssocGroupSA ( CAnimBlendAssocGroupSAInterface
     SetupAnimBlock ();
 }
 
-CAnimBlendAssociation * CAnimBlendAssocGroupSA::CopyAnimation ( unsigned int AnimID )
+CAnimBlendAssociationSAInterface * CAnimBlendAssocGroupSA::CopyAnimation ( unsigned int AnimID )
 {
-    CAnimBlendAssociation * pAnimAssociationReturn = nullptr;
+    CAnimBlendAssociationSAInterface * pAnimAssociationReturn = nullptr;
 
     DWORD dwThis = ( DWORD ) m_pInterface;
     DWORD dwFunc = FUNC_CAnimBlendAssocGroup_CopyAnimation;

Client/game_sa/CAnimBlendAssocGroupSA.h

@@ -46,12 +46,12 @@ class CAnimBlendAssocGroupSA : public CAnimBlendAssocGroup
 public:
                                         CAnimBlendAssocGroupSA  ( CAnimBlendAssocGroupSAInterface * pInterface );
 
-    CAnimBlendAssociation           *   CopyAnimation           ( unsigned int AnimID );
+    CAnimBlendAssociationSAInterface *  CopyAnimation           ( unsigned int AnimID );
     void                                InitEmptyAssociations   ( RpClump * pClump );
     bool                                IsCreated               ( void );
     int                                 GetNumAnimations        ( void );
-    CAnimBlock                      *   GetAnimBlock            ( void );
-    CAnimBlendStaticAssociation     *   GetAnimation            ( unsigned int ID );
+    CAnimBlock                       *  GetAnimBlock            ( void );
+    CAnimBlendStaticAssociation      *  GetAnimation            ( unsigned int ID );
     void                                CreateAssociations      ( const char * szBlockName );
 
     bool                                IsLoaded                ( void );
@@ -60,8 +60,8 @@ class CAnimBlendAssocGroupSA : public CAnimBlendAssocGroup
 protected:
     void                                SetupAnimBlock          ( void );
 
-    CAnimBlendAssocGroupSAInterface *   m_pInterface;
-    CAnimBlockSA                    *   m_pAnimBlock;
+    CAnimBlendAssocGroupSAInterface  *  m_pInterface;
+    CAnimBlockSA                     *  m_pAnimBlock;
 };
 
 #endif

Client/mods/deathmatch/logic/CClientGame.cpp

@@ -25,6 +25,7 @@
 #include "StdInc.h"
 #include <net/SyncStructures.h>
 #include <../Client/game_sa/CAnimBlendAssocGroupSA.h>
+#include <../Client/game_sa/CAnimBlendAssociationSA.h>
 
 SString StringZeroPadout ( const SString& strInput, uint uiPadoutSize )
 {
@@ -3691,7 +3692,7 @@ bool CClientGame::StaticChokingHandler ( unsigned char ucWeaponType )
     return g_pClientGame->ChokingHandler ( ucWeaponType );
 }
 
-CAnimBlendAssociation * CClientGame::StaticAddAnimationHandler ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID )
+CAnimBlendAssociationSAInterface * CClientGame::StaticAddAnimationHandler ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID )
 {
     return g_pClientGame->AddAnimationHandler ( pClump, animGroup, animID );
 }
@@ -3982,18 +3983,18 @@ bool CClientGame::ChokingHandler ( unsigned char ucWeaponType )
     return m_pLocalPlayer->CallEvent ( "onClientPlayerChoke", Arguments, true );
 }
 
-CAnimBlendAssociation * CClientGame::AddAnimationHandler ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID )
+CAnimBlendAssociationSAInterface * CClientGame::AddAnimationHandler ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID )
 {
     printf ( "AddAnimationHandler called! GroupID, AnimID: %d, %d\n", animGroup, animID );
 
     //CClientPed * pPed = m_pPedManager->Get ( pClump, true );
 
     hCAnimBlendAssocGroup_CopyAnimation CAnimBlendAssocGroup_CopyAnimation = reinterpret_cast < hCAnimBlendAssocGroup_CopyAnimation > ( FUNC_CAnimBlendAssocGroup_CopyAnimation );
 
-    CAnimBlendAssocGroupSAInterface * pAnimAssocGroup  = reinterpret_cast < CAnimBlendAssocGroupSAInterface * > ( ((DWORD*)*(DWORD*)0x00B4EA34)  + (5 * animGroup) );
-    CAnimBlendAssociation           * pAnimAssociation = CAnimBlendAssocGroup_CopyAnimation ( pAnimAssocGroup, animID );
-
+    CAnimBlendAssocGroupSAInterface  * pAnimAssocGroup  = reinterpret_cast < CAnimBlendAssocGroupSAInterface * > ( ((DWORD*)*(DWORD*)0x00B4EA34)  + (5 * animGroup) );
+    CAnimBlendAssociationSAInterface * pAnimAssociation = CAnimBlendAssocGroup_CopyAnimation ( pAnimAssocGroup, animID );
 
+    printf ("pThis: %p | sAnimGroup: %d | sAnimID: %d\n\n", (void*)pAnimAssociation, pAnimAssociation->sAnimGroup, pAnimAssociation->sAnimID);
     //CAnimBlendAssociation * pAnimAssociation = CAnimBlendAssocGroup_CopyAnimation ( pAnimAssocGroupInterface, animID );
     //CAnimBlendAssocGroupSA pAssocGroupSA ( pAnimAssocGroupInterface );
     //CAnimBlendAssociation  * pAnimAssociation = pAssocGroupSA.CopyAnimation ( animID );

Client/mods/deathmatch/logic/CClientGame.h

@@ -56,7 +56,7 @@
 #include "CSingularFileDownloadManager.h"
 #include "CObjectRespawner.h"
 
-typedef CAnimBlendAssociation *  ( __thiscall * hCAnimBlendAssocGroup_CopyAnimation )
+typedef CAnimBlendAssociationSAInterface *  ( __thiscall * hCAnimBlendAssocGroup_CopyAnimation )
 (
     CAnimBlendAssocGroupSAInterface * pThis, 
     AnimationId                       AnimID
@@ -508,9 +508,9 @@ class CClientGame
     static void                         StaticPreWorldProcessHandler    ( void );
     static void                         StaticPostWorldProcessHandler   ( void );
     static void                         StaticPreFxRenderHandler        ( void );
-    static void                         StaticPreHudRenderHandler       ( void );
-    static CAnimBlendAssociation *      StaticAddAnimationHandler       ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID );
-    static void                         StaticBlendAnimationHandler     ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID, float fBlendDelta );
+    static void                               StaticPreHudRenderHandler       ( void );
+    static CAnimBlendAssociationSAInterface * StaticAddAnimationHandler       ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID );
+    static void                               StaticBlendAnimationHandler     ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID, float fBlendDelta );
     static bool                         StaticProcessCollisionHandler   ( CEntitySAInterface* pThisInterface, CEntitySAInterface* pOtherInterface );
     static bool                         StaticVehicleCollisionHandler   ( CVehicleSAInterface* pThisInterface, CEntitySAInterface* pOtherInterface, int iModelIndex, float fDamageImpulseMag, float fCollidingDamageImpulseMag, uint16 usPieceType, CVector vecCollisionPos, CVector vecCollisionVelocity  );
     static bool                         StaticVehicleDamageHandler      ( CEntitySAInterface* pVehicleInterface, float fLoss, CEntitySAInterface* pAttackerInterface, eWeaponType weaponType, const CVector& vecDamagePos, uchar ucTyre );
@@ -540,7 +540,7 @@ class CClientGame
     bool                                ChokingHandler                  ( unsigned char ucWeaponType );
     void                                PreWorldProcessHandler          ( void );
     void                                PostWorldProcessHandler         ( void );
-    CAnimBlendAssociation *             AddAnimationHandler             ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID );
+    CAnimBlendAssociationSAInterface *  AddAnimationHandler             ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID );
     void                                BlendAnimationHandler           ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID, float fBlendDelta );
     bool                                ProcessCollisionHandler         ( CEntitySAInterface* pThisInterface, CEntitySAInterface* pOtherInterface );
     bool                                VehicleCollisionHandler         ( CVehicleSAInterface* pCollidingVehicle, CEntitySAInterface* pCollidedVehicle, int iModelIndex, float fDamageImpulseMag, float fCollidingDamageImpulseMag, uint16 usPieceType, CVector vecCollisionPos, CVector vecCollisionVelocity  );

Client/sdk/game/CAnimBlendAssocGroup.h

@@ -22,12 +22,12 @@ class CAnimBlock;
 class CAnimBlendAssocGroup
 {
 public:
-	virtual CAnimBlendAssociation           *   CopyAnimation           ( unsigned int AnimID ) = 0;
+	virtual CAnimBlendAssociationSAInterface *  CopyAnimation           ( unsigned int AnimID ) = 0;
     virtual void                                InitEmptyAssociations   ( RpClump * pClump ) = 0;
     virtual bool                                IsCreated               ( void ) = 0;
     virtual int                                 GetNumAnimations        ( void ) = 0;
-    virtual CAnimBlock                      *   GetAnimBlock            ( void ) = 0;
-    virtual CAnimBlendStaticAssociation     *   GetAnimation            ( unsigned int ID ) = 0;
+    virtual CAnimBlock                       *  GetAnimBlock            ( void ) = 0;
+    virtual CAnimBlendStaticAssociation      *  GetAnimation            ( unsigned int ID ) = 0;
     virtual void                                CreateAssociations      ( const char * szBlockName ) = 0;
     virtual bool                                IsLoaded                ( void ) = 0;
     virtual void                                SetIDOffset             ( int iOffset ) = 0;

Client/sdk/multiplayer/CMultiplayer.h

@@ -19,6 +19,7 @@
 #include <game/CStats.h>
 #include "CPopulationMP.h"
 #include "CLimits.h"
+#include <../Client/game_sa/CAnimBlendAssociationSA.h>
 
 struct SRwResourceStats
 {
@@ -36,7 +37,7 @@ struct SClothesCacheStats
     uint uiNumRemoved;
 };
 
-class CAnimBlendAssociation;
+class CAnimBlendAssociationSAInterface;
 typedef unsigned long AssocGroupId;
 typedef unsigned long AnimationId;
 
@@ -64,7 +65,7 @@ typedef void ( PostWorldProcessHandler ) ( void );
 typedef void ( IdleHandler ) ( void );
 typedef void ( PreFxRenderHandler ) ( void );
 typedef void ( PreHudRenderHandler ) ( void );
-typedef CAnimBlendAssociation * ( AddAnimationHandler ) ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID );
+typedef CAnimBlendAssociationSAInterface * ( AddAnimationHandler ) ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID );
 typedef void ( BlendAnimationHandler ) ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID, float fBlendDelta );
 typedef bool ( ProcessCollisionHandler ) ( class CEntitySAInterface* pThisInterface, class CEntitySAInterface* pOtherInterface );
 typedef bool ( VehicleCollisionHandler ) ( class CVehicleSAInterface* pCollidingVehicle, class CEntitySAInterface* pCollidedVehicle, int iModelIndex, float fDamageImpulseMag, float fCollidingDamageImpulseMag, uint16 usPieceType, CVector vecCollisionPos, CVector vecCollisionVelocity );