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

Consolidate duplicate OnEntityCreated logic (bug 6119, r=KyleS).

Browse Source 
--HG--
extra : rebase_source : b0f563081c5d98c3fbc2769ee89e3ce0ec093624
This commit is contained in:
Nicholas Hastings 2014-05-10 22:21:42 -04:00
parent adc9569e23
commit 6b27a7fe46
2 changed files with 27 additions and 34 deletions
extensions/sdkhooks
extension.cppextension.h

60
extensions/sdkhooks/extension.cpp
View File

@ -403,23 +403,8 @@ void SDKHooks::OnPluginUnloaded(IPlugin *plugin)
void SDKHooks::OnClientPutInServer(int client) void SDKHooks::OnClientPutInServer(int client)
{ {
CBaseEntity *pPlayer = gamehelpers->ReferenceToEntity(client); CBaseEntity *pPlayer = gamehelpers->ReferenceToEntity(client);
const char *pName = gamehelpers->GetEntityClassname(pPlayer);
// Send OnEntityCreated to SM listeners HandleEntityCreated(pPlayer, client);
SourceHook::List<ISMEntityListener *>::iterator iter;
ISMEntityListener *pListener = NULL;
for (iter=m_EntListeners.begin(); iter!=m_EntListeners.end(); iter++)
{
pListener = (*iter);
pListener->OnEntityCreated(pPlayer, pName ? pName : "");
}
// Call OnEntityCreated forward
g_pOnEntityCreated->PushCell(client);
g_pOnEntityCreated->PushString(pName ? pName : "");
g_pOnEntityCreated->Execute(NULL);
m_EntityExists.Set(client);
} }
void SDKHooks::OnClientDisconnecting(int client) void SDKHooks::OnClientDisconnecting(int client)
@ -827,28 +812,14 @@ void SDKHooks::Unhook(int entity, SDKHookType type, IPluginFunction *pCallback)
void SDKHooks::OnEntityCreated(CBaseEntity *pEntity) void SDKHooks::OnEntityCreated(CBaseEntity *pEntity)
{ {
// Call OnEntityCreated forward // Call OnEntityCreated forward
int entity = gamehelpers->ReferenceToIndex(gamehelpers->EntityToBCompatRef(pEntity)); int ref = gamehelpers->EntityToBCompatRef(pEntity);
if (m_EntityExists.IsBitSet(entity) || (entity > 0 && entity <= playerhelpers->GetMaxClients())) int index = gamehelpers->ReferenceToIndex(ref);
if (m_EntityExists.IsBitSet(index) || (index > 0 && index <= playerhelpers->GetMaxClients()))
{ {
return; return;
} }
const char *pName = gamehelpers->GetEntityClassname(pEntity); HandleEntityCreated(pEntity, ref);
// Send OnEntityCreated to SM listeners
SourceHook::List<ISMEntityListener *>::iterator iter;
ISMEntityListener *pListener = NULL;
for (iter=m_EntListeners.begin(); iter!=m_EntListeners.end(); iter++)
{
pListener = (*iter);
pListener->OnEntityCreated(pEntity, pName ? pName : "");
}
g_pOnEntityCreated->PushCell(gamehelpers->EntityToBCompatRef(pEntity));
g_pOnEntityCreated->PushString(pName ? pName : "");
g_pOnEntityCreated->Execute(NULL);
m_EntityExists.Set(entity);
} }
#ifdef GAMEDESC_CAN_CHANGE #ifdef GAMEDESC_CAN_CHANGE
@ -1716,6 +1687,27 @@ bool SDKHooks::Hook_WeaponSwitchPost(CBaseCombatWeapon *pWeapon, int viewmodelin
RETURN_META_VALUE(MRES_IGNORED, true); RETURN_META_VALUE(MRES_IGNORED, true);
} }
void SDKHooks::HandleEntityCreated(CBaseEntity *pEntity, int ref)
{
const char *pName = gamehelpers->GetEntityClassname(pEntity);
// Send OnEntityCreated to SM listeners
SourceHook::List<ISMEntityListener *>::iterator iter;
ISMEntityListener *pListener = NULL;
for (iter = m_EntListeners.begin(); iter != m_EntListeners.end(); iter++)
{
pListener = (*iter);
pListener->OnEntityCreated(pEntity, pName ? pName : "");
}
// Call OnEntityCreated forward
g_pOnEntityCreated->PushCell(ref);
g_pOnEntityCreated->PushString(pName ? pName : "");
g_pOnEntityCreated->Execute(NULL);
m_EntityExists.Set(gamehelpers->ReferenceToIndex(ref));
}
void SDKHooks::HandleEntityDeleted(CBaseEntity *pEntity, int ref) void SDKHooks::HandleEntityDeleted(CBaseEntity *pEntity, int ref)
{ {
// Send OnEntityDestroyed to SM listeners // Send OnEntityDestroyed to SM listeners

1
extensions/sdkhooks/extension.h
View File

@ -331,6 +331,7 @@ public:
bool Hook_WeaponSwitchPost(CBaseCombatWeapon *pWeapon, int viewmodelindex); bool Hook_WeaponSwitchPost(CBaseCombatWeapon *pWeapon, int viewmodelindex);
private: private:
void HandleEntityCreated(CBaseEntity *pEntity, int ref);
void HandleEntityDeleted(CBaseEntity *pEntity, int ref); void HandleEntityDeleted(CBaseEntity *pEntity, int ref);
void Unhook(CBaseEntity *pEntity); void Unhook(CBaseEntity *pEntity);
void Unhook(IPluginContext *pContext); void Unhook(IPluginContext *pContext);