UNLOZE/sm-ext-sourcetvmanager
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up some SDK calls to use SourceHook directly

Browse Source 
Don't use IBinTools to call virtual functions. We're in C++! Use
SourceHook right away. This reduces in less and readable code.
This commit is contained in:
Peace-Maker
2016-03-03 09:13:59 +01:00
parent 7dd6897067
commit 4d62d77e55
5 changed files with 89 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
natives.cpp
+22 -43
View File
@@ -30,12 +30,31 @@
*/
#include "extension.h"
#include "natives.h"
#define TICK_INTERVAL (gpGlobals->interval_per_tick)
#define TIME_TO_TICKS( dt ) ( (int)( 0.5f + (float)(dt) / TICK_INTERVAL ) )
extern const sp_nativeinfo_t sourcetv_natives[];
SH_DECL_MANUALHOOK0_void_vafmt(CBaseServer_BroadcastPrintf, 0, 0, 0);
bool g_bHasClientPrintfOffset = false;
void SetupNativeCalls()
{
int offset = -1;
if (!g_pGameConf->GetOffset("CBaseServer::BroadcastPrintf", &offset) || offset == -1)
{
smutils->LogError(myself, "Failed to get CBaseServer::BroadcastPrintf offset.");
}
else
{
SH_MANUALHOOK_RECONFIGURE(CBaseServer_BroadcastPrintf, offset, 0, 0);
g_bHasClientPrintfOffset = true;
}
}
// native SourceTV_GetServerInstanceCount();
static cell_t Native_GetServerInstanceCount(IPluginContext *pContext, const cell_t *params)
{
@@ -238,34 +257,8 @@ static cell_t Native_BroadcastConsoleMessage(IPluginContext *pContext, const cel
if (hltvserver == nullptr)
return 0;
static ICallWrapper *pBroadcastPrintf = nullptr;
if (!pBroadcastPrintf)
{
int offset = -1;
if (!g_pGameConf->GetOffset("CBaseServer::BroadcastPrintf", &offset) || offset == -1)
{
pContext->ReportError("Failed to get CBaseServer::BroadcastPrintf offset.");
return 0;
}
PassInfo pass[3];
pass[0].flags = PASSFLAG_BYVAL;
pass[0].type = PassType_Basic;
pass[0].size = sizeof(void *);
pass[1].flags = PASSFLAG_BYVAL;
pass[1].type = PassType_Basic;
pass[1].size = sizeof(char *);
pass[2].flags = PASSFLAG_BYVAL;
pass[2].type = PassType_Basic;
pass[2].size = sizeof(char *);
void *iserver = (void *)hltvserver->GetBaseServer();
void **vtable = *(void ***)iserver;
void *func = vtable[offset];
pBroadcastPrintf = bintools->CreateCall(func, CallConv_Cdecl, NULL, pass, 3);
}
if (!g_bHasClientPrintfOffset)
return 0;
char buffer[1024];
size_t len;
@@ -276,21 +269,7 @@ static cell_t Native_BroadcastConsoleMessage(IPluginContext *pContext, const cel
return 0;
}
static char fmt[] = "%s\n";
if (pBroadcastPrintf)
{
unsigned char vstk[sizeof(void *) + sizeof(char *) * 2];
unsigned char *vptr = vstk;
*(void **)vptr = (void *)hltvserver->GetBaseServer();
vptr += sizeof(void *);
*(char **)vptr = fmt;
vptr += sizeof(char *);
*(char **)vptr = buffer;
pBroadcastPrintf->Execute(vstk, NULL);
}
SH_MCALL(hltvserver->GetBaseServer(), CBaseServer_BroadcastPrintf)("%s\n", buffer);
return 1;
}