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

DHooks: Allow setting CBaseEntity* param to NULL #1751 (#1754)

Browse Source 
* DHooks: Allow setting CBaseEntity* param to NULL #1751

The param had to be a valid entity and wasn't allowed to be set to NULL. Behave similar to SetReturn which maps INVALID_ENT_REFERENCE (or -1) to NULL.

* Update include documentation
This commit is contained in:
peace-maker
2022-04-20 15:32:37 +02:00
committed by GitHub
parent a7cb35c2af
commit 39d604ae6c
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/dhooks/natives.cpp
+12 -5
View File
@@ -700,14 +700,21 @@ cell_t Native_SetParam(IPluginContext *pContext, const cell_t *params)
break;
case HookParamType_CBaseEntity:
{
CBaseEntity *pEnt = gamehelpers->ReferenceToEntity(params[2]);
if(!pEnt)
if(params[2] == -1)
{
return pContext->ThrowNativeError("Invalid entity index passed for param value");
*(CBaseEntity **)addr = nullptr;
}
else
{
CBaseEntity *pEnt = gamehelpers->ReferenceToEntity(params[2]);
*(CBaseEntity **)addr = pEnt;
if(!pEnt)
{
return pContext->ThrowNativeError("Invalid entity index passed for param value");
}
*(CBaseEntity **)addr = pEnt;
}
break;
}
case HookParamType_Edict: