|
24 | 24 |
|
25 | 25 | #include "StdInc.h"
|
26 | 26 | #include <net/SyncStructures.h>
|
| 27 | +#include <../Client/game_sa/CAnimBlendAssocGroupSA.h> |
27 | 28 |
|
28 | 29 | SString StringZeroPadout ( const SString& strInput, uint uiPadoutSize )
|
29 | 30 | {
|
@@ -3690,9 +3691,9 @@ bool CClientGame::StaticChokingHandler ( unsigned char ucWeaponType )
|
3690 | 3691 | return g_pClientGame->ChokingHandler ( ucWeaponType );
|
3691 | 3692 | }
|
3692 | 3693 |
|
3693 |
| -void CClientGame::StaticAddAnimationHandler ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID ) |
| 3694 | +CAnimBlendAssociation * CClientGame::StaticAddAnimationHandler ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID ) |
3694 | 3695 | {
|
3695 |
| - g_pClientGame->AddAnimationHandler ( pClump, animGroup, animID ); |
| 3696 | + return g_pClientGame->AddAnimationHandler ( pClump, animGroup, animID ); |
3696 | 3697 | }
|
3697 | 3698 |
|
3698 | 3699 | void CClientGame::StaticBlendAnimationHandler ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID, float fBlendDelta )
|
@@ -3981,10 +3982,23 @@ bool CClientGame::ChokingHandler ( unsigned char ucWeaponType )
|
3981 | 3982 | return m_pLocalPlayer->CallEvent ( "onClientPlayerChoke", Arguments, true );
|
3982 | 3983 | }
|
3983 | 3984 |
|
3984 |
| - |
3985 |
| -void CClientGame::AddAnimationHandler ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID ) |
| 3985 | +CAnimBlendAssociation * CClientGame::AddAnimationHandler ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID ) |
3986 | 3986 | {
|
| 3987 | + printf ( "AddAnimationHandler called! GroupID, AnimID: %d, %d\n", animGroup, animID ); |
| 3988 | + |
3987 | 3989 | //CClientPed * pPed = m_pPedManager->Get ( pClump, true );
|
| 3990 | + |
| 3991 | + hCAnimBlendAssocGroup_CopyAnimation CAnimBlendAssocGroup_CopyAnimation = reinterpret_cast < hCAnimBlendAssocGroup_CopyAnimation > ( FUNC_CAnimBlendAssocGroup_CopyAnimation ); |
| 3992 | + |
| 3993 | + CAnimBlendAssocGroupSAInterface * pAnimAssocGroup = reinterpret_cast < CAnimBlendAssocGroupSAInterface * > ( ((DWORD*)*(DWORD*)0x00B4EA34) + (5 * animGroup) ); |
| 3994 | + CAnimBlendAssociation * pAnimAssociation = CAnimBlendAssocGroup_CopyAnimation ( pAnimAssocGroup, animID ); |
| 3995 | + |
| 3996 | + |
| 3997 | + //CAnimBlendAssociation * pAnimAssociation = CAnimBlendAssocGroup_CopyAnimation ( pAnimAssocGroupInterface, animID ); |
| 3998 | + //CAnimBlendAssocGroupSA pAssocGroupSA ( pAnimAssocGroupInterface ); |
| 3999 | + //CAnimBlendAssociation * pAnimAssociation = pAssocGroupSA.CopyAnimation ( animID ); |
| 4000 | + |
| 4001 | + return pAnimAssociation; |
3988 | 4002 | }
|
3989 | 4003 |
|
3990 | 4004 | void CClientGame::BlendAnimationHandler ( RpClump * pClump, AssocGroupId animGroup, AnimationId animID, float fBlendDelta )
|
|
0 commit comments