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

Remove OnEntitySpawned C++ listener (#1342)

Browse Source 
This is causing crashes with existing extensions using entity listeners.

Currently no one is asking for a C++ hook here, if it is desired it
needs to be done with proper versioning of the listener interface, which
is going to be a little bit more complicated without an initial hard
break.

https://forums.alliedmods.net/showpost.php?p=2715337&postcount=789
https://discordapp.com/channels/335290997317697536/335290997317697536/748101258186850334

This is a partial revert of #1078.
This commit is contained in:
Asher Baker 2020-08-26 12:53:31 +01:00 committed by GitHub
parent 6e2c5a66b3
commit ea3f55f030
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/sdkhooks/extension.cpp
View File

@ -1831,19 +1831,12 @@ void SDKHooks::HandleEntityCreated(CBaseEntity *pEntity, int index, cell_t ref)
void SDKHooks::HandleEntitySpawned(CBaseEntity *pEntity, int index, cell_t ref) void SDKHooks::HandleEntitySpawned(CBaseEntity *pEntity, int index, cell_t ref)
{ {
if (g_pOnEntitySpawned->GetFunctionCount() || m_EntListeners.size()) if (g_pOnEntitySpawned->GetFunctionCount())
{ {
const char *pName = gamehelpers->GetEntityClassname(pEntity); const char *pName = gamehelpers->GetEntityClassname(pEntity);
if (!pName) if (!pName)
pName = ""; pName = "";
// Send OnEntitySpawned to SM listeners
for (SourceHook::List<ISMEntityListener *>::iterator iter = m_EntListeners.begin(); iter != m_EntListeners.end(); iter++)
{
ISMEntityListener *pListener = (*iter);
pListener->OnEntitySpawned(pEntity, pName);
}
// Call OnEntitySpawned forward // Call OnEntitySpawned forward
if (g_pOnEntitySpawned->GetFunctionCount()) if (g_pOnEntitySpawned->GetFunctionCount())
{ {

12
public/extensions/ISDKHooks.h
View File

@ -36,7 +36,7 @@
#include <IShareSys.h> #include <IShareSys.h>
#define SMINTERFACE_SDKHOOKS_NAME "ISDKHooks" #define SMINTERFACE_SDKHOOKS_NAME "ISDKHooks"
#define SMINTERFACE_SDKHOOKS_VERSION 2 #define SMINTERFACE_SDKHOOKS_VERSION 1
class CBaseEntity; class CBaseEntity;
@ -71,16 +71,6 @@ namespace SourceMod
virtual void OnEntityDestroyed(CBaseEntity *pEntity) virtual void OnEntityDestroyed(CBaseEntity *pEntity)
{ {
} }
/**
* @brief When an entity is spawned
*
* @param pEntity CBaseEntity entity.
* @param classname Entity classname.
*/
virtual void OnEntitySpawned(CBaseEntity *pEntity, const char *classname)
{
}
}; };
/** /**