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

Update multiple SDKTools calls to be x64-safe [sizeof(void*) != sizeof(int)]

Browse Source
This commit is contained in:
Nick Hastings 2021-09-23 23:24:43 -04:00 committed by Your Name
parent 410eb01f91
commit b909ea07ec
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
extensions/sdktools/vnatives.cpp
View File

@ -190,9 +190,9 @@ static cell_t GiveNamedItem(IPluginContext *pContext, const cell_t *params)
DECODE_VALVE_PARAM(1, thisinfo, 0); DECODE_VALVE_PARAM(1, thisinfo, 0);
DECODE_VALVE_PARAM(2, vparams, 0); DECODE_VALVE_PARAM(2, vparams, 0);
DECODE_VALVE_PARAM(3, vparams, 1); DECODE_VALVE_PARAM(3, vparams, 1);
*(CEconItemView **)(vptr + 12) = NULL; *(CEconItemView **)(vptr + sizeof(void *) + sizeof(void *) + sizeof(int)) = NULL;
*(bool *)(vptr + 16) = false; *(bool *)(vptr + sizeof(void *) + sizeof(void *) + sizeof(int) + sizeof(void *)) = false;
*(void **)(vptr + 17) = NULL; *(void **)(vptr + sizeof(void *) + sizeof(void *) + sizeof(int) + sizeof(void *) + sizeof(bool)) = NULL;
FINISH_CALL_SIMPLE(&pEntity); FINISH_CALL_SIMPLE(&pEntity);
return gamehelpers->EntityToBCompatRef(pEntity); return gamehelpers->EntityToBCompatRef(pEntity);
@ -223,8 +223,8 @@ static cell_t GiveNamedItem(IPluginContext *pContext, const cell_t *params)
DECODE_VALVE_PARAM(1, thisinfo, 0); DECODE_VALVE_PARAM(1, thisinfo, 0);
DECODE_VALVE_PARAM(2, vparams, 0); DECODE_VALVE_PARAM(2, vparams, 0);
DECODE_VALVE_PARAM(3, vparams, 1); DECODE_VALVE_PARAM(3, vparams, 1);
*(CEconItemView **)(vptr + 12) = NULL; *(CEconItemView **)(vptr + sizeof(void *) + sizeof(void *) + sizeof(int)) = NULL;
*(bool *)(vptr + 16) = false; *(bool *)(vptr + sizeof(void *) + sizeof(void *) + sizeof(int) + sizeof(void *)) = false;
FINISH_CALL_SIMPLE(&pEntity); FINISH_CALL_SIMPLE(&pEntity);
return gamehelpers->EntityToBCompatRef(pEntity); return gamehelpers->EntityToBCompatRef(pEntity);
@ -400,8 +400,8 @@ static cell_t IgniteEntity(IPluginContext *pContext, const cell_t *params)
#if SOURCE_ENGINE == SE_SDK2013 #if SOURCE_ENGINE == SE_SDK2013
if (!strcmp(g_pSM->GetGameFolderName(), "nmrih")) if (!strcmp(g_pSM->GetGameFolderName(), "nmrih"))
{ {
*(int *) (vptr + 14) = 0; *(int *) (vptr + sizeof(void *) + sizeof(float) + sizeof(bool) + sizeof(float) + sizeof(bool)) = 0;
*(int *) (vptr + 18) = 0; *(int *) (vptr + sizeof(void *) + sizeof(float) + sizeof(bool) + sizeof(float) + sizeof(bool) + sizeof(int)) = 0;
} }
#endif // SDK2013 #endif // SDK2013
@ -515,8 +515,8 @@ static cell_t ForcePlayerSuicide(IPluginContext *pContext, const cell_t *params)
START_CALL(); START_CALL();
DECODE_VALVE_PARAM(1, thisinfo, 0); DECODE_VALVE_PARAM(1, thisinfo, 0);
*(bool *)(vptr + 4) = false; *(bool *)(vptr + sizeof(void *)) = false;
*(bool *)(vptr + 5) = false; *(bool *)(vptr + sizeof(void *) + sizeof(bool)) = false;
FINISH_CALL_SIMPLE(NULL); FINISH_CALL_SIMPLE(NULL);
return 1; return 1;