UNLOZE/sourcemod
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Exposed third parameter of TF2's AddCond in TF2_AddCondition (bug 5641, r=psychonic).

Browse Source
This commit is contained in:
FlaminSarge
2013-03-16 18:05:22 -04:00
parent 707e820af6
commit 093f8cb89b
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/tf2/natives.cpp
+9 -2
View File
@@ -236,7 +236,7 @@ cell_t TF2_AddCondition(IPluginContext *pContext, const cell_t *params)
{
static ICallWrapper *pWrapper = NULL;
// CTFPlayerShared::AddCond(int, float)
// CTFPlayerShared::AddCond(int, float, CBaseEntity *)
if (!pWrapper)
{
REGISTER_NATIVE_ADDR("AddCondition",
@@ -259,6 +259,13 @@ cell_t TF2_AddCondition(IPluginContext *pContext, const cell_t *params)
return pContext->ThrowNativeError("Client index %d is not valid", params[1]);
}
CBaseEntity *pInflictor = NULL;
// Compatibility fix for the new inflictor parameter; TF2 seems to only use player entities in it
if (params[0] >= 4 && params[4] > 0 && !(pInflictor = UTIL_GetCBaseEntity(params[4], true)))
{
return pContext->ThrowNativeError("Inflictor index %d is not valid", params[4]);
}
void *obj = (void *)((uint8_t *)pEntity + playerSharedOffset->actual_offset);
unsigned char vstk[sizeof(void *) + sizeof(int) + sizeof(float) + sizeof(CBaseEntity *)];
@@ -270,7 +277,7 @@ cell_t TF2_AddCondition(IPluginContext *pContext, const cell_t *params)
vptr += sizeof(int);
*(float *)vptr = *(float *)&params[3];
vptr += sizeof(float);
*(CBaseEntity **)vptr = NULL;
*(CBaseEntity **)vptr = pInflictor;
pWrapper->Execute(vstk, NULL);