Updated OnEntity* listeners

Ayuto · Ayuto · commit a5480b48dacb · 2015-08-31T22:41:28.000+02:00
They now receive a BaseEntity object instead of a Pointer object
diff --git a/src/core/sp_main.cpp b/src/core/sp_main.cpp
@@ -58,6 +58,7 @@
 
 #include "modules/listeners/listeners_manager.h"
 #include "utilities/conversions.h"
+#include "modules/entities/entities_entity.h"
 
 
 //-----------------------------------------------------------------------------
@@ -468,8 +469,7 @@ void CSourcePython::OnEdictFreed( const edict_t *edict )
 #ifdef ENGINE_BMS
 void CSourcePython::OnEntityPreSpawned( CBaseEntity *pEntity )
 {
-	CPointer pAddress = CPointer((unsigned long) pEntity);
-	CALL_LISTENERS(OnEntityPreSpawned, pAddress);
+	CALL_LISTENERS(OnEntityPreSpawned, ptr((CBaseEntityWrapper*) pEntity));
 }
 #endif
 
@@ -483,20 +483,17 @@ void CSourcePython::OnEntityCreated( CBaseEntity *pEntity )
 		if (pServerUnknown)
 			pEdict->m_pNetworkable = pServerUnknown->GetNetworkable();
 	}
-	CPointer pAddress = CPointer((unsigned long) pEntity);
-	CALL_LISTENERS(OnEntityCreated, iIndex, ptr(&pAddress));
+	CALL_LISTENERS(OnEntityCreated, iIndex, ptr((CBaseEntityWrapper*) pEntity));
 }
 
 void CSourcePython::OnEntitySpawned( CBaseEntity *pEntity )
 {
-	CPointer pAddress = CPointer((unsigned long) pEntity);
-	CALL_LISTENERS(OnEntitySpawned, IndexFromBaseEntity(pEntity), ptr(&pAddress));
+	CALL_LISTENERS(OnEntitySpawned, IndexFromBaseEntity(pEntity), ptr((CBaseEntityWrapper*) pEntity));
 }
 
 void CSourcePython::OnEntityDeleted( CBaseEntity *pEntity )
 {
-	CPointer pAddress = CPointer((unsigned long) pEntity);
-	CALL_LISTENERS(OnEntityDeleted, IndexFromBaseEntity(pEntity), ptr(&pAddress));
+	CALL_LISTENERS(OnEntityDeleted, IndexFromBaseEntity(pEntity), ptr((CBaseEntityWrapper*) pEntity));
 }
 
 void CSourcePython::OnDataLoaded( MDLCacheDataType_t type, MDLHandle_t handle )

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@`
`58`	`58`
`59`	`59`	`#include "modules/listeners/listeners_manager.h"`
`60`	`60`	`#include "utilities/conversions.h"`
	`61`	`+#include "modules/entities/entities_entity.h"`
`61`	`62`
`62`	`63`
`63`	`64`	`//-----------------------------------------------------------------------------`
`@@ -468,8 +469,7 @@ void CSourcePython::OnEdictFreed( const edict_t *edict )`
`468`	`469`	`#ifdef ENGINE_BMS`
`469`	`470`	`void CSourcePython::OnEntityPreSpawned( CBaseEntity *pEntity )`
`470`	`471`	`{`
`471`		`- CPointer pAddress = CPointer((unsigned long) pEntity);`
`472`		`- CALL_LISTENERS(OnEntityPreSpawned, pAddress);`
	`472`	`+ CALL_LISTENERS(OnEntityPreSpawned, ptr((CBaseEntityWrapper*) pEntity));`
`473`	`473`	`}`
`474`	`474`	`#endif`
`475`	`475`
`@@ -483,20 +483,17 @@ void CSourcePython::OnEntityCreated( CBaseEntity *pEntity )`
`483`	`483`	`if (pServerUnknown)`
`484`	`484`	`pEdict->m_pNetworkable = pServerUnknown->GetNetworkable();`
`485`	`485`	`}`
`486`		`- CPointer pAddress = CPointer((unsigned long) pEntity);`
`487`		`- CALL_LISTENERS(OnEntityCreated, iIndex, ptr(&pAddress));`
	`486`	`+ CALL_LISTENERS(OnEntityCreated, iIndex, ptr((CBaseEntityWrapper*) pEntity));`
`488`	`487`	`}`
`489`	`488`
`490`	`489`	`void CSourcePython::OnEntitySpawned( CBaseEntity *pEntity )`
`491`	`490`	`{`
`492`		`- CPointer pAddress = CPointer((unsigned long) pEntity);`
`493`		`- CALL_LISTENERS(OnEntitySpawned, IndexFromBaseEntity(pEntity), ptr(&pAddress));`
	`491`	`+ CALL_LISTENERS(OnEntitySpawned, IndexFromBaseEntity(pEntity), ptr((CBaseEntityWrapper*) pEntity));`
`494`	`492`	`}`
`495`	`493`
`496`	`494`	`void CSourcePython::OnEntityDeleted( CBaseEntity *pEntity )`
`497`	`495`	`{`
`498`		`- CPointer pAddress = CPointer((unsigned long) pEntity);`
`499`		`- CALL_LISTENERS(OnEntityDeleted, IndexFromBaseEntity(pEntity), ptr(&pAddress));`
	`496`	`+ CALL_LISTENERS(OnEntityDeleted, IndexFromBaseEntity(pEntity), ptr((CBaseEntityWrapper*) pEntity));`
`500`	`497`	`}`
`501`	`498`
`502`	`499`	`void CSourcePython::OnDataLoaded( MDLCacheDataType_t type, MDLHandle_t handle )`