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

sdktools: Rename SetCollisionGroup to SetEntityCollisionGroup (#1513)

Browse Source 
Better aligns the with other natives - makes more sense.
This commit is contained in:
Adam Short 2021-07-10 16:10:26 -04:00 committed by GitHub
parent 387b85406e
commit 5aedb73aae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/sdktools/vnatives.cpp
View File

@ -1499,8 +1499,8 @@ static cell_t GivePlayerAmmo(IPluginContext *pContext, const cell_t *params)
return ammoGiven; return ammoGiven;
} }
// SetCollisionGroup(int entity, int collisionGroup) // SetEntityCollisionGroup(int entity, int collisionGroup)
static cell_t SetCollisionGroup(IPluginContext *pContext, const cell_t *params) static cell_t SetEntityCollisionGroup(IPluginContext *pContext, const cell_t *params)
{ {
static ICallWrapper *pSetCollisionGroup = NULL; static ICallWrapper *pSetCollisionGroup = NULL;
if (!pSetCollisionGroup) if (!pSetCollisionGroup)
@ -1508,7 +1508,7 @@ static cell_t SetCollisionGroup(IPluginContext *pContext, const cell_t *params)
void *addr; void *addr;
if (!g_pGameConf->GetMemSig("SetCollisionGroup", &addr) || !addr) if (!g_pGameConf->GetMemSig("SetCollisionGroup", &addr) || !addr)
{ {
return pContext->ThrowNativeError("\"SetCollisionGroup\" not supported by this mod"); return pContext->ThrowNativeError("\"SetEntityCollisionGroup\" not supported by this mod");
} }
PassInfo pass[2]; PassInfo pass[2];
// Entity // Entity
@ -1523,7 +1523,7 @@ static cell_t SetCollisionGroup(IPluginContext *pContext, const cell_t *params)
if (!(pSetCollisionGroup = g_pBinTools->CreateCall(addr, CallConv_ThisCall, NULL, pass, 2))) if (!(pSetCollisionGroup = g_pBinTools->CreateCall(addr, CallConv_ThisCall, NULL, pass, 2)))
{ {
return pContext->ThrowNativeError("\"SetCollisionGroup\" wrapper failed to initialize"); return pContext->ThrowNativeError("\"SetEntityCollisionGroup\" wrapper failed to initialize");
} }
} }
@ -1569,6 +1569,6 @@ sp_nativeinfo_t g_Natives[] =
{"SetClientName", SetClientName}, {"SetClientName", SetClientName},
{"GetPlayerResourceEntity", GetPlayerResourceEntity}, {"GetPlayerResourceEntity", GetPlayerResourceEntity},
{"GivePlayerAmmo", GivePlayerAmmo}, {"GivePlayerAmmo", GivePlayerAmmo},
{"SetCollisionGroup", SetCollisionGroup}, {"SetEntityCollisionGroup", SetEntityCollisionGroup},
{NULL, NULL}, {NULL, NULL},
}; };

2
plugins/include/sdktools_functions.inc
View File

@ -359,4 +359,4 @@ native int GivePlayerAmmo(int client, int amount, int ammotype, bool suppressSou
* @param collisionGroup Collision group to use. * @param collisionGroup Collision group to use.
* @error Invalid entity or lack of mod support. * @error Invalid entity or lack of mod support.
*/ */
native void SetCollisionGroup(int entity, int collisionGroup); native void SetEntityCollisionGroup(int entity, int collisionGroup);