reHLDS/reapi
2
0
Fork 0
mirror of https://github.com/rehlds/reapi.git synced 2024-12-29 08:05:36 +03:00
Code Issues Projects Releases Wiki Activity

Update SDK

Browse Source 
Reworked PM_AirMove hook, add physent argument
This commit is contained in:
s1lentq 2023-07-16 03:57:03 +07:00
parent d9b72bf3a3
commit 87e4858476
4 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reapi/extra/amxmodx/scripting/include/reapi_gamedll_const.inc
View File

@ -410,7 +410,7 @@ enum GamedllFunc
/* /*
* Description: Called when a player is on a ladder. * Description: Called when a player is on a ladder.
* Params: (const playerIndex) * Params: (const pLadder, const playerIndex)
*/ */
RG_PM_LadderMove, RG_PM_LadderMove,
}; };

10
reapi/include/cssdk/dlls/regamedll_api.h
View File

@ -39,7 +39,7 @@
#include <API/CSInterfaces.h> #include <API/CSInterfaces.h>
#define REGAMEDLL_API_VERSION_MAJOR 5 #define REGAMEDLL_API_VERSION_MAJOR 5
#define REGAMEDLL_API_VERSION_MINOR 21 #define REGAMEDLL_API_VERSION_MINOR 22
// CBasePlayer::Spawn hook // CBasePlayer::Spawn hook
typedef IHookChainClass<void, class CBasePlayer> IReGameHook_CBasePlayer_Spawn; typedef IHookChainClass<void, class CBasePlayer> IReGameHook_CBasePlayer_Spawn;
@ -525,6 +525,10 @@ typedef IHookChainRegistryClass<void, class CBasePlayer> IReGameHookRegistry_CBa
typedef IHookChainClass<void, class CBasePlayer> IReGameHook_CBasePlayer_JoiningThink; typedef IHookChainClass<void, class CBasePlayer> IReGameHook_CBasePlayer_JoiningThink;
typedef IHookChainRegistryClass<void, class CBasePlayer> IReGameHookRegistry_CBasePlayer_JoiningThink; typedef IHookChainRegistryClass<void, class CBasePlayer> IReGameHookRegistry_CBasePlayer_JoiningThink;
// FreeGameRules hook
typedef IHookChain<void, class CGameRules **> IReGameHook_FreeGameRules;
typedef IHookChainRegistry<void, class CGameRules **> IReGameHookRegistry_FreeGameRules;
class IReGameHookchains { class IReGameHookchains {
public: public:
virtual ~IReGameHookchains() {} virtual ~IReGameHookchains() {}
@ -659,6 +663,7 @@ public:
virtual IReGameHookRegistry_CBasePlayer_DeathSound *CBasePlayer_DeathSound() = 0; virtual IReGameHookRegistry_CBasePlayer_DeathSound *CBasePlayer_DeathSound() = 0;
virtual IReGameHookRegistry_CBasePlayer_JoiningThink *CBasePlayer_JoiningThink() = 0; virtual IReGameHookRegistry_CBasePlayer_JoiningThink *CBasePlayer_JoiningThink() = 0;
virtual IReGameHookRegistry_FreeGameRules *FreeGameRules() = 0;
virtual IReGameHookRegistry_PM_LadderMove *PM_LadderMove() = 0; virtual IReGameHookRegistry_PM_LadderMove *PM_LadderMove() = 0;
}; };
@ -677,6 +682,9 @@ struct ReGameFuncs_t {
class CGrenade *(*PlantBomb)(entvars_t *pevOwner, Vector &vecStart, Vector &vecVelocity); class CGrenade *(*PlantBomb)(entvars_t *pevOwner, Vector &vecStart, Vector &vecVelocity);
class CGib *(*SpawnHeadGib)(entvars_t *pevVictim); class CGib *(*SpawnHeadGib)(entvars_t *pevVictim);
void (*SpawnRandomGibs)(entvars_t *pevVictim, int cGibs, int human); void (*SpawnRandomGibs)(entvars_t *pevVictim, int cGibs, int human);
void (*UTIL_RestartOther)(const char *szClassname);
void (*UTIL_ResetEntities)();
void (*UTIL_RemoveOther)(const char *szClassname, int nCount);
}; };
class IReGameApi { class IReGameApi {

12
reapi/src/hook_callback.cpp
View File

@ -899,21 +899,19 @@ void PM_AirMove(IReGameHook_PM_AirMove *chain, int playerIndex)
callVoidForward(RG_PM_AirMove, original, playerIndex); callVoidForward(RG_PM_AirMove, original, playerIndex);
} }
void PM_LadderMove_AMXX(Phys_T *data, int playerIndex) void PM_LadderMove_AMXX(IReGameHook_PM_LadderMove *chain, physent_t *pLadder, int playerIndex)
{ {
auto original = [data](int _playerIndex) auto original = [chain](physent_t *_pLadder, int _playerIndex)
{ {
data->m_chain->callNext(data->m_args.pLadder); chain->callNext(_pLadder);
}; };
callVoidForward(RG_PM_LadderMove, original, playerIndex); callVoidForward(RG_PM_LadderMove, original, pLadder, playerIndex);
} }
void PM_LadderMove(IReGameHook_PM_LadderMove *chain, physent_t *pLadder) void PM_LadderMove(IReGameHook_PM_LadderMove *chain, physent_t *pLadder)
{ {
PM_LadderMove_args_t args(pLadder); PM_LadderMove_AMXX(chain, pLadder, pLadder->player + 1);
Phys_T data(chain, args);
PM_LadderMove_AMXX(&data, pLadder->player + 1);
} }
BOOL CSGameRules_FShouldSwitchWeapon(IReGameHook_CSGameRules_FShouldSwitchWeapon *chain, CBasePlayer *pPlayer, CBasePlayerItem *pWeapon) BOOL CSGameRules_FShouldSwitchWeapon(IReGameHook_CSGameRules_FShouldSwitchWeapon *chain, CBasePlayer *pPlayer, CBasePlayerItem *pWeapon)

11
reapi/src/hook_callback.h
View File

@ -402,16 +402,7 @@ void PM_Move_AMXX(Move_t *data, int playerIndex);
void PM_Move(IReGameHook_PM_Move *chain, playermove_t *ppmove, int server); void PM_Move(IReGameHook_PM_Move *chain, playermove_t *ppmove, int server);
void PM_AirMove(IReGameHook_PM_AirMove *chain, int playerIndex); void PM_AirMove(IReGameHook_PM_AirMove *chain, int playerIndex);
void PM_LadderMove_AMXX(IReGameHook_PM_LadderMove *chain, physent_t *pLadder, int playerIndex);
struct PM_LadderMove_args_t
{
PM_LadderMove_args_t(physent_t *_ladder) : pLadder(_ladder) {}
physent_t *pLadder;
};
using Phys_T = hookdata_t<IReGameHook_PM_LadderMove *, PM_LadderMove_args_t &>;
void PM_LadderMove_AMXX(Phys_T *data);
void PM_LadderMove(IReGameHook_PM_LadderMove *chain, physent_t *pLadder); void PM_LadderMove(IReGameHook_PM_LadderMove *chain, physent_t *pLadder);
void HandleMenu_ChooseAppearance(IReGameHook_HandleMenu_ChooseAppearance *chain, CBasePlayer *pPlayer, int slot); void HandleMenu_ChooseAppearance(IReGameHook_HandleMenu_ChooseAppearance *chain, CBasePlayer *pPlayer, int slot);