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

Make sure processing and fwd calls happen on main thread.

Browse Source
This commit is contained in:
Nicholas Hastings 2015-02-18 05:35:58 -08:00
parent 6bc2d20177
commit c4a58b1c95
2 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
extensions/tf2/conditions.cpp
View File

@ -38,34 +38,41 @@
IForward *g_addCondForward = NULL; IForward *g_addCondForward = NULL;
IForward *g_removeCondForward = NULL; IForward *g_removeCondForward = NULL;
template<PlayerConditionsMgr::CondVar CondVar> struct CondChangeData_t
static void OnPlayerCondChange(const SendProp *pProp, const void *pStructBase, const void *pData, DVariant *pOut, int iElement, int objectID)
{ {
g_CondMgr.OnConVarChange(CondVar, pProp, pStructBase, pData, pOut, iElement, objectID); CBaseEntity *pPlayer;
PlayerConditionsMgr::CondVar var;
int newConds;
};
void HandleCondChange(void *pData)
{
auto *pCondData = reinterpret_cast<CondChangeData_t *>(pData);
g_CondMgr.ProcessCondChange(pCondData);
} }
void PlayerConditionsMgr::OnConVarChange(CondVar var, const SendProp *pProp, const void *pStructBase, const void *pData, DVariant *pOut, int iElement, int objectID) void PlayerConditionsMgr::ProcessCondChange(CondChangeData_t *pCondData)
{ {
CBaseEntity *pPlayer = (CBaseEntity *)((intp) pStructBase - GetPropOffs(m_Shared)); int client = gamehelpers->EntityToBCompatRef(pCondData->pPlayer);
int client = gamehelpers->EntityToBCompatRef(pPlayer);
int newConds = 0; int newConds = 0;
int prevConds = 0; int prevConds = 0;
CondVar var = pCondData->var;
if (var == m_nPlayerCond) if (var == m_nPlayerCond)
{ {
prevConds = m_OldConds[client][_condition_bits] | m_OldConds[client][var]; prevConds = m_OldConds[client][_condition_bits] | m_OldConds[client][var];
newConds = m_OldConds[client][_condition_bits] | *(int *) (pData); newConds = m_OldConds[client][_condition_bits] | pCondData->newConds;
} }
else if (var == _condition_bits) else if (var == _condition_bits)
{ {
prevConds = m_OldConds[client][m_nPlayerCond] | m_OldConds[client][var]; prevConds = m_OldConds[client][m_nPlayerCond] | m_OldConds[client][var];
newConds = m_OldConds[client][m_nPlayerCond] | *(int *)(pData); newConds = m_OldConds[client][m_nPlayerCond] | pCondData->newConds;
} }
else else
{ {
prevConds = m_OldConds[client][var]; prevConds = m_OldConds[client][var];
newConds = *(int *)pData; newConds = pCondData->newConds;
} }
if (prevConds != newConds) if (prevConds != newConds)
@ -81,17 +88,35 @@ void PlayerConditionsMgr::OnConVarChange(CondVar var, const SendProp *pProp, con
{ {
g_addCondForward->PushCell(client); g_addCondForward->PushCell(client);
g_addCondForward->PushCell(i); g_addCondForward->PushCell(i);
g_addCondForward->Execute(NULL, NULL); g_addCondForward->Execute(NULL);
} }
else if (removedConds & (1 << i)) else if (removedConds & (1 << i))
{ {
g_removeCondForward->PushCell(client); g_removeCondForward->PushCell(client);
g_removeCondForward->PushCell(i); g_removeCondForward->PushCell(i);
g_removeCondForward->Execute(NULL, NULL); g_removeCondForward->Execute(NULL);
} }
} }
} }
delete pCondData;
}
template<PlayerConditionsMgr::CondVar CondVar>
static void OnPlayerCondChange(const SendProp *pProp, const void *pStructBase, const void *pData, DVariant *pOut, int iElement, int objectID)
{
g_CondMgr.OnConVarChange(CondVar, pProp, pStructBase, pData, pOut, iElement, 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;
pCondData->pPlayer = (CBaseEntity *)((intp)pStructBase - GetPropOffs(m_Shared));
pCondData->var = var;
pCondData->newConds = *(int *)pData;
g_pSM->AddFrameAction(&HandleCondChange, pCondData);
if (m_BackupProxyFns[var] != nullptr) if (m_BackupProxyFns[var] != nullptr)
m_BackupProxyFns[var](pProp, pStructBase, pData, pOut, iElement, objectID); m_BackupProxyFns[var](pProp, pStructBase, pData, pOut, iElement, objectID);
} }
@ -162,4 +187,4 @@ void PlayerConditionsMgr::OnClientPutInServer(int client)
memset(&m_OldConds[client], 0, sizeof(m_OldConds[0])); memset(&m_OldConds[client], 0, sizeof(m_OldConds[0]));
} }
PlayerConditionsMgr g_CondMgr; PlayerConditionsMgr g_CondMgr;

3
extensions/tf2/conditions.h
View File

@ -34,6 +34,8 @@
#include "extension.h" #include "extension.h"
struct CondChangeData_t;
class PlayerConditionsMgr : public IClientListener class PlayerConditionsMgr : public IClientListener
{ {
public: public:
@ -56,6 +58,7 @@ public:
}; };
void OnConVarChange(CondVar var, const SendProp *pProp, const void *pStructBase, const void *pData, DVariant *pOut, int iElement, int objectID); void OnConVarChange(CondVar var, const SendProp *pProp, const void *pStructBase, const void *pData, DVariant *pOut, int iElement, int objectID);
void ProcessCondChange(CondChangeData_t *pCondData);
private: private:
inline unsigned int GetPropOffs(CondVar var) inline unsigned int GetPropOffs(CondVar var)
{ {