reHLDS/reapi
2
0
Fork 0
mirror of https://github.com/rehlds/reapi.git synced 2025-04-23 14:53:44 +03:00
Code Issues Projects Releases Wiki Activity

Implement Con_Printf() hook (#222)

Browse Source 
* Implement Con_Printf hook

* Update REHLDS_API_VERSION_MINOR

* FIX rehlds_api.h

* Update rehlds_api.h

* Update reapi_engine_const.inc

* Update reapi_engine_const.inc

* FIX pointer style

* FIX pointer style

* Update hook_list.cpp

* Update reapi/src/hook_list.h

Co-authored-by: justgo97 <hamdi2050@live.com>

* Apply suggestions from code review

Co-authored-by: Sergey Shorokhov <wopox1337@ya.ru>
Co-authored-by: justgo97 <hamdi2050@live.com>
This commit is contained in:
Franco Romaniello 2021-10-25 19:10:00 +02:00 committed by GitHub
parent 866295f111
commit dd1fdae53b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
reapi/extra/amxmodx/scripting/include/reapi_engine_const.inc
View File

@ -77,7 +77,6 @@ enum EngineFunc
* Params: (const this) * Params: (const this)
*/ */
RH_SV_EmitPings, RH_SV_EmitPings,
/* /*
* Description: Called when an entity is created. * Description: Called when an entity is created.
* Return type: Edict * (Entity index) * Return type: Edict * (Entity index)
@ -90,6 +89,12 @@ enum EngineFunc
* Params: (const entity) * Params: (const entity)
*/ */
RH_ED_Free, RH_ED_Free,
/*
* Description: -
* Params: (const string[])
*/
RH_Con_Printf,
}; };
/** /**

13
reapi/include/cssdk/engine/rehlds_api.h
View File

@ -187,8 +187,8 @@ typedef IHookChain<int, enum sv_delta_s, IGameClient *, struct packet_entities_s
typedef IHookChainRegistry<int, enum sv_delta_s, IGameClient *, struct packet_entities_s *, struct sizebuf_s *> IRehldsHookRegistry_SV_CreatePacketEntities; typedef IHookChainRegistry<int, enum sv_delta_s, IGameClient *, struct packet_entities_s *, struct sizebuf_s *> IRehldsHookRegistry_SV_CreatePacketEntities;
//SV_EmitSound2 hook //SV_EmitSound2 hook
typedef IHookChain<bool, edict_t *, IGameClient *, int, const char*, float, float, int, int, int, const float*> IRehldsHook_SV_EmitSound2; typedef IHookChain<bool, edict_t *, IGameClient *, int, const char *, float, float, int, int, int, const float *> IRehldsHook_SV_EmitSound2;
typedef IHookChainRegistry<bool, edict_t *, IGameClient *, int, const char*, float, float, int, int, int, const float*> IRehldsHookRegistry_SV_EmitSound2; typedef IHookChainRegistry<bool, edict_t *, IGameClient *, int, const char *, float, float, int, int, int, const float *> IRehldsHookRegistry_SV_EmitSound2;
//CreateFakeClient hook //CreateFakeClient hook
typedef IHookChain<edict_t *, const char *> IRehldsHook_CreateFakeClient; typedef IHookChain<edict_t *, const char *> IRehldsHook_CreateFakeClient;
@ -203,8 +203,8 @@ typedef IVoidHookChain<> IRehldsHook_SV_Frame;
typedef IVoidHookChainRegistry<> IRehldsHookRegistry_SV_Frame; typedef IVoidHookChainRegistry<> IRehldsHookRegistry_SV_Frame;
//SV_ShouldSendConsistencyList hook //SV_ShouldSendConsistencyList hook
typedef IHookChain<bool, IGameClient*, bool> IRehldsHook_SV_ShouldSendConsistencyList; typedef IHookChain<bool, IGameClient *, bool> IRehldsHook_SV_ShouldSendConsistencyList;
typedef IHookChainRegistry<bool, IGameClient*, bool> IRehldsHookRegistry_SV_ShouldSendConsistencyList; typedef IHookChainRegistry<bool, IGameClient *, bool> IRehldsHookRegistry_SV_ShouldSendConsistencyList;
//GetEntityInit hook //GetEntityInit hook
typedef IHookChain<ENTITYINIT, char *> IRehldsHook_GetEntityInit; typedef IHookChain<ENTITYINIT, char *> IRehldsHook_GetEntityInit;
@ -222,6 +222,10 @@ typedef IHookChainRegistry<edict_t *> IRehldsHookRegistry_ED_Alloc;
typedef IVoidHookChain<edict_t *> IRehldsHook_ED_Free; typedef IVoidHookChain<edict_t *> IRehldsHook_ED_Free;
typedef IVoidHookChainRegistry<edict_t *> IRehldsHookRegistry_ED_Free; typedef IVoidHookChainRegistry<edict_t *> IRehldsHookRegistry_ED_Free;
//Con_Printf hook
typedef IHookChain<void, const char *> IRehldsHook_Con_Printf;
typedef IHookChainRegistry<void, const char *> IRehldsHookRegistry_Con_Printf;
class IRehldsHookchains { class IRehldsHookchains {
public: public:
virtual ~IRehldsHookchains() { } virtual ~IRehldsHookchains() { }
@ -272,6 +276,7 @@ public:
virtual IRehldsHookRegistry_SV_EmitPings* SV_EmitPings() = 0; virtual IRehldsHookRegistry_SV_EmitPings* SV_EmitPings() = 0;
virtual IRehldsHookRegistry_ED_Alloc* ED_Alloc() = 0; virtual IRehldsHookRegistry_ED_Alloc* ED_Alloc() = 0;
virtual IRehldsHookRegistry_ED_Free* ED_Free() = 0; virtual IRehldsHookRegistry_ED_Free* ED_Free() = 0;
virtual IRehldsHookRegistry_Con_Printf* Con_Printf() = 0;
}; };
struct RehldsFuncs_t { struct RehldsFuncs_t {

10
reapi/src/hook_callback.cpp
View File

@ -63,6 +63,16 @@ void SV_WriteFullClientUpdate(IRehldsHook_SV_WriteFullClientUpdate *chain, IGame
SV_WriteFullClientUpdate_AMXX(&data, client, (size_t)buffer, receiver); SV_WriteFullClientUpdate_AMXX(&data, client, (size_t)buffer, receiver);
} }
void Con_Printf(IRehldsHook_Con_Printf *chain, const char *string)
{
auto original = [chain](const char *_string)
{
chain->callNext(_string);
};
callVoidForward(RH_Con_Printf, original, string);
}
ENTITYINIT GetEntityInit(IRehldsHook_GetEntityInit *chain, char *classname) ENTITYINIT GetEntityInit(IRehldsHook_GetEntityInit *chain, char *classname)
{ {
auto original = [chain](char *_classname) auto original = [chain](char *_classname)

1
reapi/src/hook_callback.h
View File

@ -359,6 +359,7 @@ struct SV_EmitPings_args_t
using SV_EmitPings_t = hookdata_t<IRehldsHook_SV_EmitPings *, SV_EmitPings_args_t &>; using SV_EmitPings_t = hookdata_t<IRehldsHook_SV_EmitPings *, SV_EmitPings_args_t &>;
void SV_EmitPings_AMXX(SV_EmitPings_t *data, IGameClient *client); void SV_EmitPings_AMXX(SV_EmitPings_t *data, IGameClient *client);
void SV_EmitPings(IRehldsHook_SV_EmitPings *chain, IGameClient *client, sizebuf_t *msg); void SV_EmitPings(IRehldsHook_SV_EmitPings *chain, IGameClient *client, sizebuf_t *msg);
void Con_Printf(IRehldsHook_Con_Printf *chain, const char *string);
edict_t *ED_Alloc(IRehldsHook_ED_Alloc* chain); edict_t *ED_Alloc(IRehldsHook_ED_Alloc* chain);
void ED_Free(IRehldsHook_ED_Free* chain, edict_t *entity); void ED_Free(IRehldsHook_ED_Free* chain, edict_t *entity);

1
reapi/src/hook_list.cpp
View File

@ -93,6 +93,7 @@ hook_t hooklist_engine[] = {
ENG(SV_EmitPings, _AMXX), ENG(SV_EmitPings, _AMXX),
ENG(ED_Alloc), ENG(ED_Alloc),
ENG(ED_Free), ENG(ED_Free),
ENG(Con_Printf),
}; };
#define DLL(h,...) { {}, {}, #h, "ReGameDLL", [](){ return api_cfg.hasReGameDLL(); }, ((!(RG_##h & (MAX_REGION_RANGE - 1)) ? regfunc::current_cell = 1, true : false) || (RG_##h & (MAX_REGION_RANGE - 1)) == regfunc::current_cell++) ? regfunc(h##__VA_ARGS__) : regfunc(#h#__VA_ARGS__), [](){ g_ReGameHookchains->h()->registerHook(&h); }, [](){ g_ReGameHookchains->h()->unregisterHook(&h); }, false} #define DLL(h,...) { {}, {}, #h, "ReGameDLL", [](){ return api_cfg.hasReGameDLL(); }, ((!(RG_##h & (MAX_REGION_RANGE - 1)) ? regfunc::current_cell = 1, true : false) || (RG_##h & (MAX_REGION_RANGE - 1)) == regfunc::current_cell++) ? regfunc(h##__VA_ARGS__) : regfunc(#h#__VA_ARGS__), [](){ g_ReGameHookchains->h()->registerHook(&h); }, [](){ g_ReGameHookchains->h()->unregisterHook(&h); }, false}

1
reapi/src/hook_list.h
View File

@ -104,6 +104,7 @@ enum EngineFunc
RH_SV_EmitPings, RH_SV_EmitPings,
RH_ED_Alloc, RH_ED_Alloc,
RH_ED_Free, RH_ED_Free,
RH_Con_Printf,
// [...] // [...]
}; };