Skip to content

Commit 0eb7080

Browse files
codenullscodenulls
committed
changed CAnimBlendAssociation * to CAnimBlendAssociationSAInterface *
1 parent bba1a39 commit 0eb7080

File tree

6 files changed

+24
-22
lines changed

6 files changed

+24
-22
lines changed

‎Client/game_sa/CAnimBlendAssocGroupSA.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ CAnimBlendAssocGroupSA::CAnimBlendAssocGroupSA ( CAnimBlendAssocGroupSAInterface
1919
SetupAnimBlock ();
2020
}
2121

22-
CAnimBlendAssociation * CAnimBlendAssocGroupSA::CopyAnimation ( unsigned int AnimID )
22+
CAnimBlendAssociationSAInterface * CAnimBlendAssocGroupSA::CopyAnimation ( unsigned int AnimID )
2323
{
24-
CAnimBlendAssociation * pAnimAssociationReturn = nullptr;
24+
CAnimBlendAssociationSAInterface * pAnimAssociationReturn = nullptr;
2525

2626
DWORD dwThis = ( DWORD ) m_pInterface;
2727
DWORD dwFunc = FUNC_CAnimBlendAssocGroup_CopyAnimation;

‎Client/game_sa/CAnimBlendAssocGroupSA.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ class CAnimBlendAssocGroupSA : public CAnimBlendAssocGroup
4646
public:
4747
CAnimBlendAssocGroupSA ( CAnimBlendAssocGroupSAInterface * pInterface );
4848

49-
CAnimBlendAssociation * CopyAnimation ( unsigned int AnimID );
49+
CAnimBlendAssociationSAInterface * CopyAnimation ( unsigned int AnimID );
5050
void InitEmptyAssociations ( RpClump * pClump );
5151
bool IsCreated ( void );
5252
int GetNumAnimations ( void );
53-
CAnimBlock * GetAnimBlock ( void );
54-
CAnimBlendStaticAssociation * GetAnimation ( unsigned int ID );
53+
CAnimBlock * GetAnimBlock ( void );
54+
CAnimBlendStaticAssociation * GetAnimation ( unsigned int ID );
5555
void CreateAssociations ( const char * szBlockName );
5656

5757
bool IsLoaded ( void );
@@ -60,8 +60,8 @@ class CAnimBlendAssocGroupSA : public CAnimBlendAssocGroup
6060
protected:
6161
void SetupAnimBlock ( void );
6262

63-
CAnimBlendAssocGroupSAInterface * m_pInterface;
64-
CAnimBlockSA * m_pAnimBlock;
63+
CAnimBlendAssocGroupSAInterface * m_pInterface;
64+
CAnimBlockSA * m_pAnimBlock;
6565
};
6666

6767
#endif

‎Client/mods/deathmatch/logic/CClientGame.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "StdInc.h"
2626
#include <net/SyncStructures.h>
2727
#include <../Client/game_sa/CAnimBlendAssocGroupSA.h>
28+
#include <../Client/game_sa/CAnimBlendAssociationSA.h>
2829

2930
SString StringZeroPadout ( const SString& strInput, uint uiPadoutSize )
3031
{
@@ -3691,7 +3692,7 @@ bool CClientGame::StaticChokingHandler ( unsigned char ucWeaponType )
36913692
return g_pClientGame->ChokingHandler ( ucWeaponType );
36923693
}
36933694

3694-
CAnimBlendAssociation * CClientGame::StaticAddAnimationHandler ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID )
3695+
CAnimBlendAssociationSAInterface * CClientGame::StaticAddAnimationHandler ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID )
36953696
{
36963697
return g_pClientGame->AddAnimationHandler ( pClump, animGroup, animID );
36973698
}
@@ -3982,18 +3983,18 @@ bool CClientGame::ChokingHandler ( unsigned char ucWeaponType )
39823983
return m_pLocalPlayer->CallEvent ( "onClientPlayerChoke", Arguments, true );
39833984
}
39843985

3985-
CAnimBlendAssociation * CClientGame::AddAnimationHandler ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID )
3986+
CAnimBlendAssociationSAInterface * CClientGame::AddAnimationHandler ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID )
39863987
{
39873988
printf ( "AddAnimationHandler called! GroupID, AnimID: %d, %d\n", animGroup, animID );
39883989

39893990
//CClientPed * pPed = m_pPedManager->Get ( pClump, true );
39903991

39913992
hCAnimBlendAssocGroup_CopyAnimation CAnimBlendAssocGroup_CopyAnimation = reinterpret_cast < hCAnimBlendAssocGroup_CopyAnimation > ( FUNC_CAnimBlendAssocGroup_CopyAnimation );
39923993

3993-
CAnimBlendAssocGroupSAInterface * pAnimAssocGroup = reinterpret_cast < CAnimBlendAssocGroupSAInterface * > ( ((DWORD*)*(DWORD*)0x00B4EA34) + (5 * animGroup) );
3994-
CAnimBlendAssociation * pAnimAssociation = CAnimBlendAssocGroup_CopyAnimation ( pAnimAssocGroup, animID );
3995-
3994+
CAnimBlendAssocGroupSAInterface * pAnimAssocGroup = reinterpret_cast < CAnimBlendAssocGroupSAInterface * > ( ((DWORD*)*(DWORD*)0x00B4EA34) + (5 * animGroup) );
3995+
CAnimBlendAssociationSAInterface * pAnimAssociation = CAnimBlendAssocGroup_CopyAnimation ( pAnimAssocGroup, animID );
39963996

3997+
printf ("pThis: %p | sAnimGroup: %d | sAnimID: %d\n\n", (void*)pAnimAssociation, pAnimAssociation->sAnimGroup, pAnimAssociation->sAnimID);
39973998
//CAnimBlendAssociation * pAnimAssociation = CAnimBlendAssocGroup_CopyAnimation ( pAnimAssocGroupInterface, animID );
39983999
//CAnimBlendAssocGroupSA pAssocGroupSA ( pAnimAssocGroupInterface );
39994000
//CAnimBlendAssociation * pAnimAssociation = pAssocGroupSA.CopyAnimation ( animID );

‎Client/mods/deathmatch/logic/CClientGame.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
#include "CSingularFileDownloadManager.h"
5757
#include "CObjectRespawner.h"
5858

59-
typedef CAnimBlendAssociation * ( __thiscall * hCAnimBlendAssocGroup_CopyAnimation )
59+
typedef CAnimBlendAssociationSAInterface * ( __thiscall * hCAnimBlendAssocGroup_CopyAnimation )
6060
(
6161
CAnimBlendAssocGroupSAInterface * pThis,
6262
AnimationId AnimID
@@ -508,9 +508,9 @@ class CClientGame
508508
static void StaticPreWorldProcessHandler ( void );
509509
static void StaticPostWorldProcessHandler ( void );
510510
static void StaticPreFxRenderHandler ( void );
511-
static void StaticPreHudRenderHandler ( void );
512-
static CAnimBlendAssociation * StaticAddAnimationHandler ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID );
513-
static void StaticBlendAnimationHandler ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID, float fBlendDelta );
511+
static void StaticPreHudRenderHandler ( void );
512+
static CAnimBlendAssociationSAInterface * StaticAddAnimationHandler ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID );
513+
static void StaticBlendAnimationHandler ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID, float fBlendDelta );
514514
static bool StaticProcessCollisionHandler ( CEntitySAInterface* pThisInterface, CEntitySAInterface* pOtherInterface );
515515
static bool StaticVehicleCollisionHandler ( CVehicleSAInterface* pThisInterface, CEntitySAInterface* pOtherInterface, int iModelIndex, float fDamageImpulseMag, float fCollidingDamageImpulseMag, uint16 usPieceType, CVector vecCollisionPos, CVector vecCollisionVelocity );
516516
static bool StaticVehicleDamageHandler ( CEntitySAInterface* pVehicleInterface, float fLoss, CEntitySAInterface* pAttackerInterface, eWeaponType weaponType, const CVector& vecDamagePos, uchar ucTyre );
@@ -540,7 +540,7 @@ class CClientGame
540540
bool ChokingHandler ( unsigned char ucWeaponType );
541541
void PreWorldProcessHandler ( void );
542542
void PostWorldProcessHandler ( void );
543-
CAnimBlendAssociation * AddAnimationHandler ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID );
543+
CAnimBlendAssociationSAInterface * AddAnimationHandler ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID );
544544
void BlendAnimationHandler ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID, float fBlendDelta );
545545
bool ProcessCollisionHandler ( CEntitySAInterface* pThisInterface, CEntitySAInterface* pOtherInterface );
546546
bool VehicleCollisionHandler ( CVehicleSAInterface* pCollidingVehicle, CEntitySAInterface* pCollidedVehicle, int iModelIndex, float fDamageImpulseMag, float fCollidingDamageImpulseMag, uint16 usPieceType, CVector vecCollisionPos, CVector vecCollisionVelocity );

‎Client/sdk/game/CAnimBlendAssocGroup.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ class CAnimBlock;
2222
class CAnimBlendAssocGroup
2323
{
2424
public:
25-
virtual CAnimBlendAssociation * CopyAnimation ( unsigned int AnimID ) = 0;
25+
virtual CAnimBlendAssociationSAInterface * CopyAnimation ( unsigned int AnimID ) = 0;
2626
virtual void InitEmptyAssociations ( RpClump * pClump ) = 0;
2727
virtual bool IsCreated ( void ) = 0;
2828
virtual int GetNumAnimations ( void ) = 0;
29-
virtual CAnimBlock * GetAnimBlock ( void ) = 0;
30-
virtual CAnimBlendStaticAssociation * GetAnimation ( unsigned int ID ) = 0;
29+
virtual CAnimBlock * GetAnimBlock ( void ) = 0;
30+
virtual CAnimBlendStaticAssociation * GetAnimation ( unsigned int ID ) = 0;
3131
virtual void CreateAssociations ( const char * szBlockName ) = 0;
3232
virtual bool IsLoaded ( void ) = 0;
3333
virtual void SetIDOffset ( int iOffset ) = 0;

‎Client/sdk/multiplayer/CMultiplayer.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <game/CStats.h>
2020
#include "CPopulationMP.h"
2121
#include "CLimits.h"
22+
#include <../Client/game_sa/CAnimBlendAssociationSA.h>
2223

2324
struct SRwResourceStats
2425
{
@@ -36,7 +37,7 @@ struct SClothesCacheStats
3637
uint uiNumRemoved;
3738
};
3839

39-
class CAnimBlendAssociation;
40+
class CAnimBlendAssociationSAInterface;
4041
typedef unsigned long AssocGroupId;
4142
typedef unsigned long AnimationId;
4243

@@ -64,7 +65,7 @@ typedef void ( PostWorldProcessHandler ) ( void );
6465
typedef void ( IdleHandler ) ( void );
6566
typedef void ( PreFxRenderHandler ) ( void );
6667
typedef void ( PreHudRenderHandler ) ( void );
67-
typedef CAnimBlendAssociation * ( AddAnimationHandler ) ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID );
68+
typedef CAnimBlendAssociationSAInterface * ( AddAnimationHandler ) ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID );
6869
typedef void ( BlendAnimationHandler ) ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID, float fBlendDelta );
6970
typedef bool ( ProcessCollisionHandler ) ( class CEntitySAInterface* pThisInterface, class CEntitySAInterface* pOtherInterface );
7071
typedef bool ( VehicleCollisionHandler ) ( class CVehicleSAInterface* pCollidingVehicle, class CEntitySAInterface* pCollidedVehicle, int iModelIndex, float fDamageImpulseMag, float fCollidingDamageImpulseMag, uint16 usPieceType, CVector vecCollisionPos, CVector vecCollisionVelocity );

0 commit comments

Comments
 (0)