Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement RG_CBasePlayer_Observer_FindNextPlayer hook #210

Merged
merged 7 commits into from
Sep 2, 2021
Merged

Implement RG_CBasePlayer_Observer_FindNextPlayer hook #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0c17b6c
Implement Observer_FindNextPlayer Hook
francoromaniello Aug 31, 2021
5f62d57
Merge branch 'upstream-master' into Observer_FindNextPlayer_hook
SergeyShorokhov Sep 2, 2021
5bfa4ce
Update regamedll_api.h
SergeyShorokhov Sep 2, 2021
0cc17c3
fix order for Vfuncs
SergeyShorokhov Sep 2, 2021
1308a87
Add description in reapi_gamedll_const.inc
SergeyShorokhov Sep 2, 2021
aa52b3e
add macro for suppress warning: 200 on amxmodx 1.8.2
SergeyShorokhov Sep 2, 2021
fb30df0
Add return type for hook description
SergeyShorokhov Sep 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion reapi/extra/amxmodx/scripting/include/reapi_gamedll_const.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#define RG_CBasePlayerWeapon_DefaultReload RG_CBaseWeapon_DefReload
#define RG_CBasePlayerWeapon_DefaultShotgunReload RG_CBaseWeapon_DefShotgunReload
#define RG_CBasePlayer_Observer_SetMode RG_CBasePlayer_Observer_SetMod
#define RG_CBasePlayer_Observer_FindNextPlayer RG_CBasePlayer_Observer_FindNxt
#endif

/**
Expand Down Expand Up @@ -791,7 +792,14 @@ enum GamedllFunc_CBasePlayer
* Params: (const this, iMode)
*/
RG_CBasePlayer_Observer_SetMode,


/*
* Description: Called when a client attempt to find the next observer.
* Return type: void
* Params: (const this, bool bReverse, name[])
*/
RG_CBasePlayer_Observer_FindNextPlayer,

/*
* Description: Called when a client emits a "pain sound" after received damage.
* Return type: void
Expand Down
7 changes: 6 additions & 1 deletion reapi/include/cssdk/dlls/regamedll_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,10 @@ typedef IHookChainRegistryClass<Vector &, class CBaseEntity, Vector &, Vector &,
typedef IHookChainClass<void, class CBasePlayer, int> IReGameHook_CBasePlayer_Observer_SetMode;
typedef IHookChainRegistryClass<void, class CBasePlayer, int> IReGameHookRegistry_CBasePlayer_Observer_SetMode;

// CBasePlayer::Observer_FindNextPlayer hook
typedef IHookChainClass<void, class CBasePlayer, bool, const char *> IReGameHook_CBasePlayer_Observer_FindNextPlayer;
typedef IHookChainRegistryClass<void, class CBasePlayer, bool, const char *> IReGameHookRegistry_CBasePlayer_Observer_FindNextPlayer;

// CBasePlayer::Pain hook
typedef IHookChainClass<void, class CBasePlayer, int, bool> IReGameHook_CBasePlayer_Pain;
typedef IHookChainRegistryClass<void, class CBasePlayer, int, bool> IReGameHookRegistry_CBasePlayer_Pain;
Expand Down Expand Up @@ -645,7 +649,8 @@ class IReGameHookchains {
virtual IReGameHookRegistry_CBaseEntity_FireBullets3 *CBaseEntity_FireBullets3() = 0;

virtual IReGameHookRegistry_CBasePlayer_Observer_SetMode *CBasePlayer_Observer_SetMode() = 0;

virtual IReGameHookRegistry_CBasePlayer_Observer_FindNextPlayer *CBasePlayer_Observer_FindNextPlayer() = 0;

virtual IReGameHookRegistry_CBasePlayer_Pain *CBasePlayer_Pain() = 0;
virtual IReGameHookRegistry_CBasePlayer_DeathSound *CBasePlayer_DeathSound() = 0;
virtual IReGameHookRegistry_CBasePlayer_JoiningThink *CBasePlayer_JoiningThink() = 0;
Expand Down
10 changes: 10 additions & 0 deletions reapi/src/hook_callback.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,16 @@ CBasePlayer *CBasePlayer_Observer_IsValidTarget(IReGameHook_CBasePlayer_Observer
return getPrivate<CBasePlayer>(callForward<size_t>(RG_CBasePlayer_Observer_IsValidTarget, original, indexOfEdict(pthis->pev), iPlayerIndex, bSameTeam));
}

void CBasePlayer_Observer_FindNextPlayer(IReGameHook_CBasePlayer_Observer_FindNextPlayer *chain, CBasePlayer *pthis, bool bReverse, const char *name)
{
auto original = [chain](int _pthis, bool _bReverse, const char *_name)
{
chain->callNext(getPrivate<CBasePlayer>(_pthis), _bReverse, _name);
};

callVoidForward(RG_CBasePlayer_Observer_FindNextPlayer, original, indexOfEdict(pthis->pev), bReverse, name);
}

void CBasePlayer_SetAnimation(IReGameHook_CBasePlayer_SetAnimation *chain, CBasePlayer *pthis, PLAYER_ANIM playerAnim)
{
auto original = [chain](int _pthis, PLAYER_ANIM _playerAnim)
Expand Down
1 change: 1 addition & 0 deletions reapi/src/hook_callback.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,7 @@ void CBasePlayer_RoundRespawn(IReGameHook_CBasePlayer_RoundRespawn *chain, CBase
void CBasePlayer_Blind(IReGameHook_CBasePlayer_Blind *chain, CBasePlayer *pthis, float flUntilTime, float flHoldTime, float flFadeTime, int iAlpha);

CBasePlayer *CBasePlayer_Observer_IsValidTarget(IReGameHook_CBasePlayer_Observer_IsValidTarget *chain, CBasePlayer *pthis, int iPlayerIndex, bool bSameTeam);
void CBasePlayer_Observer_FindNextPlayer(IReGameHook_CBasePlayer_Observer_FindNextPlayer *chain, CBasePlayer *pthis, bool bReverse, const char *name);
void CBasePlayer_SetAnimation(IReGameHook_CBasePlayer_SetAnimation *chain, CBasePlayer *pthis, PLAYER_ANIM playerAnim);
void CBasePlayer_GiveDefaultItems(IReGameHook_CBasePlayer_GiveDefaultItems *chain, CBasePlayer *pthis);
CBaseEntity *CBasePlayer_GiveNamedItem(IReGameHook_CBasePlayer_GiveNamedItem *chain, CBasePlayer *pthis, const char *pszName);
Expand Down
1 change: 1 addition & 0 deletions reapi/src/hook_list.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ hook_t hooklist_player[] = {
DLL(CBasePlayer_DropIdlePlayer),

DLL(CBasePlayer_Observer_SetMode),
DLL(CBasePlayer_Observer_FindNextPlayer),

DLL(CBasePlayer_Pain),
DLL(CBasePlayer_DeathSound),
Expand Down
1 change: 1 addition & 0 deletions reapi/src/hook_list.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ enum GamedllFunc_CBasePlayer
RG_CBasePlayer_DropIdlePlayer,

RG_CBasePlayer_Observer_SetMode,
RG_CBasePlayer_Observer_FindNextPlayer,

RG_CBasePlayer_Pain,
RG_CBasePlayer_DeathSound,
Expand Down