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

Fix for crashes related to the GameRules_Set* natives.

Browse Source
This commit is contained in:
akowald 2016-02-03 16:20:31 -05:00
parent 148943dad6
commit 7fbc9869bd
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
extensions/sdktools/gamerulesnatives.cpp
View File

@ -264,7 +264,6 @@ static cell_t GameRules_SetProp(IPluginContext *pContext, const cell_t *params)
*(int32_t *)((intptr_t)pGameRules + offset) = params[2]; *(int32_t *)((intptr_t)pGameRules + offset) = params[2];
if (sendChange) if (sendChange)
{ {
*(int32_t *)((intptr_t)pProxy + offset) = params[2];
gamehelpers->SetEdictStateChanged(gamehelpers->EdictOfIndex(gamehelpers->EntityToBCompatRef(pProxy)), offset); gamehelpers->SetEdictStateChanged(gamehelpers->EdictOfIndex(gamehelpers->EntityToBCompatRef(pProxy)), offset);
} }
} }
@ -273,7 +272,6 @@ static cell_t GameRules_SetProp(IPluginContext *pContext, const cell_t *params)
*(int16_t *)((intptr_t)pGameRules + offset) = (int16_t)params[2]; *(int16_t *)((intptr_t)pGameRules + offset) = (int16_t)params[2];
if (sendChange) if (sendChange)
{ {
*(int16_t *)((intptr_t)pProxy + offset) = (int16_t)params[2];
gamehelpers->SetEdictStateChanged(gamehelpers->EdictOfIndex(gamehelpers->EntityToBCompatRef(pProxy)), offset); gamehelpers->SetEdictStateChanged(gamehelpers->EdictOfIndex(gamehelpers->EntityToBCompatRef(pProxy)), offset);
} }
} }
@ -282,7 +280,6 @@ static cell_t GameRules_SetProp(IPluginContext *pContext, const cell_t *params)
*(int8_t *)((intptr_t)pGameRules + offset) = (int8_t)params[2]; *(int8_t *)((intptr_t)pGameRules + offset) = (int8_t)params[2];
if (sendChange) if (sendChange)
{ {
*(int8_t *)((intptr_t)pProxy + offset) = (int8_t)params[2];
gamehelpers->SetEdictStateChanged(gamehelpers->EdictOfIndex(gamehelpers->EntityToBCompatRef(pProxy)), offset); gamehelpers->SetEdictStateChanged(gamehelpers->EdictOfIndex(gamehelpers->EntityToBCompatRef(pProxy)), offset);
} }
} }
@ -291,7 +288,6 @@ static cell_t GameRules_SetProp(IPluginContext *pContext, const cell_t *params)
*(bool *)((intptr_t)pGameRules + offset) = (params[2] == 0) ? false : true; *(bool *)((intptr_t)pGameRules + offset) = (params[2] == 0) ? false : true;
if (sendChange) if (sendChange)
{ {
*(bool *)((intptr_t)pProxy + offset) = (params[2] == 0) ? false : true;
gamehelpers->SetEdictStateChanged(gamehelpers->EdictOfIndex(gamehelpers->EntityToBCompatRef(pProxy)), offset); gamehelpers->SetEdictStateChanged(gamehelpers->EdictOfIndex(gamehelpers->EntityToBCompatRef(pProxy)), offset);
} }
} }
@ -350,7 +346,6 @@ static cell_t GameRules_SetPropFloat(IPluginContext *pContext, const cell_t *par
if (sendChange) if (sendChange)
{ {
*(float *)((intptr_t)pProxy + offset) = newVal;
gamehelpers->SetEdictStateChanged(gamehelpers->EdictOfIndex(gamehelpers->EntityToBCompatRef(pProxy)), offset); gamehelpers->SetEdictStateChanged(gamehelpers->EdictOfIndex(gamehelpers->EntityToBCompatRef(pProxy)), offset);
} }
@ -430,17 +425,6 @@ static cell_t GameRules_SetPropEnt(IPluginContext *pContext, const cell_t *param
if (sendChange) if (sendChange)
{ {
CBaseHandle &hndl = *(CBaseHandle *)((intptr_t)pProxy + offset);
if (params[2] == -1)
{
hndl.Set(NULL);
}
else
{
IHandleEntity *pHandleEnt = (IHandleEntity *)pOther;
hndl.Set(pHandleEnt);
}
gamehelpers->SetEdictStateChanged(gamehelpers->EdictOfIndex(gamehelpers->EntityToBCompatRef(pProxy)), offset); gamehelpers->SetEdictStateChanged(gamehelpers->EdictOfIndex(gamehelpers->EntityToBCompatRef(pProxy)), offset);
} }
@ -510,11 +494,6 @@ static cell_t GameRules_SetPropVector(IPluginContext *pContext, const cell_t *pa
if (sendChange) if (sendChange)
{ {
v = (Vector *)((intptr_t)pProxy + offset);
v->x = sp_ctof(vec[0]);
v->y = sp_ctof(vec[1]);
v->z = sp_ctof(vec[2]);
gamehelpers->SetEdictStateChanged(gamehelpers->EdictOfIndex(gamehelpers->EntityToBCompatRef(pProxy)), offset); gamehelpers->SetEdictStateChanged(gamehelpers->EdictOfIndex(gamehelpers->EntityToBCompatRef(pProxy)), offset);
} }
@ -625,8 +604,6 @@ static cell_t GameRules_SetPropString(IPluginContext *pContext, const cell_t *pa
if (sendChange) if (sendChange)
{ {
dest = (char *)((intptr_t)pProxy + offset);
strncopy(dest, src, maxlen);
gamehelpers->SetEdictStateChanged(gamehelpers->EdictOfIndex(gamehelpers->EntityToBCompatRef(pProxy)), offset); gamehelpers->SetEdictStateChanged(gamehelpers->EdictOfIndex(gamehelpers->EntityToBCompatRef(pProxy)), offset);
} }