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

Pass a handle instead of entptr to ProcessCondChange for stability.

Browse Source
This commit is contained in:
Nicholas Hastings 2015-03-22 06:53:51 -07:00
parent 70be2941fe
commit 38817bdd2c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/tf2/conditions.cpp
View File

@ -37,7 +37,7 @@ IForward *g_removeCondForward = NULL;
struct CondChangeData_t struct CondChangeData_t
{ {
CBaseEntity *pPlayer; CBaseHandle hPlayer;
PlayerConditionsMgr::CondVar var; PlayerConditionsMgr::CondVar var;
int newConds; int newConds;
}; };
@ -51,10 +51,12 @@ static void HandleCondChange(void *pData)
void PlayerConditionsMgr::ProcessCondChange(CondChangeData_t *pCondData) void PlayerConditionsMgr::ProcessCondChange(CondChangeData_t *pCondData)
{ {
int client = gamehelpers->EntityToBCompatRef(pCondData->pPlayer); auto *pEdict = gamehelpers->GetHandleEntity(pCondData->hPlayer);
if (!playerhelpers->GetGamePlayer(client)->IsInGame()) auto *pPlayer = playerhelpers->GetGamePlayer(pEdict);
if (!pPlayer || !pPlayer->IsInGame())
return; return;
int client = pCondData->hPlayer.GetEntryIndex();
int newConds = 0; int newConds = 0;
int prevConds = 0; int prevConds = 0;
CondVar var = pCondData->var; CondVar var = pCondData->var;
@ -109,7 +111,7 @@ static void OnPlayerCondChange(const SendProp *pProp, const void *pStructBase, c
void PlayerConditionsMgr::OnConVarChange(CondVar var, const SendProp *pProp, const void *pStructBase, const void *pData, DVariant *pOut, int iElement, int objectID) void PlayerConditionsMgr::OnConVarChange(CondVar var, const SendProp *pProp, const void *pStructBase, const void *pData, DVariant *pOut, int iElement, int objectID)
{ {
auto pCondData = new CondChangeData_t; auto pCondData = new CondChangeData_t;
pCondData->pPlayer = (CBaseEntity *)((intp)pData - GetPropOffs(var)); pCondData->hPlayer = ((IHandleEntity *)((intp)pData - GetPropOffs(var)))->GetRefEHandle();
pCondData->var = var; pCondData->var = var;
pCondData->newConds = *(int *)pData; pCondData->newConds = *(int *)pData;