Skip to content

SetCollisionGroup -> SetEntityCollisionGroup #1513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KyleSanderson merged 1 commit into from
Jul 10, 2021
Merged

SetCollisionGroup -> SetEntityCollisionGroup #1513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions extensions/sdktools/vnatives.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1499,16 +1499,16 @@ static cell_t GivePlayerAmmo(IPluginContext *pContext, const cell_t *params)
return ammoGiven;
}

// SetCollisionGroup(int entity, int collisionGroup)
static cell_t SetCollisionGroup(IPluginContext *pContext, const cell_t *params)
// SetEntityCollisionGroup(int entity, int collisionGroup)
static cell_t SetEntityCollisionGroup(IPluginContext *pContext, const cell_t *params)
{
static ICallWrapper *pSetCollisionGroup = NULL;
if (!pSetCollisionGroup)
{
void *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];
// Entity
Expand All @@ -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)))
{
return pContext->ThrowNativeError("\"SetCollisionGroup\" wrapper failed to initialize");
return pContext->ThrowNativeError("\"SetEntityCollisionGroup\" wrapper failed to initialize");
}
}

Expand Down Expand Up @@ -1569,6 +1569,6 @@ sp_nativeinfo_t g_Natives[] =
{"SetClientName", SetClientName},
{"GetPlayerResourceEntity", GetPlayerResourceEntity},
{"GivePlayerAmmo", GivePlayerAmmo},
{"SetCollisionGroup", SetCollisionGroup},
{"SetEntityCollisionGroup", SetEntityCollisionGroup},
{NULL, NULL},
};
2 changes: 1 addition & 1 deletion plugins/include/sdktools_functions.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,4 +359,4 @@ native int GivePlayerAmmo(int client, int amount, int ammotype, bool suppressSou
* @param collisionGroup Collision group to use.
* @error Invalid entity or lack of mod support.
*/
native void SetCollisionGroup(int entity, int collisionGroup);
native void SetEntityCollisionGroup(int entity, int collisionGroup);