Now uses universal call_listener method; though currently only int, char and edict_t are supported.

Author: OmegaK2

src/core/addons/sp_addon.cpp

@@ -67,14 +67,18 @@ CAddonManager::~CAddonManager( void )
 void CAddonManager::GameFrame()
 {
 	// Dispatch all tick listeners
-	get_tick_listener_manager()->call_listeners();
+	get_tick_listener_manager()->call_listeners(0);
 }
 
 //---------------------------------------------------------------------------------
 // Calls network id validated listeners.
 //---------------------------------------------------------------------------------
 void CAddonManager::NetworkIDValidated( const char *pszUserName, const char *pszNetworkID )
 {
+	// Wrap the parameters
+	CListenerManager::Param p1, p2;
+	p1.name="pszUserName"; p1.type=CListenerManager::CHAR; p1.char_ptr = pszUserName;
+	p2.name="pszNetworkID"; p2.type=CListenerManager::CHAR; p2.char_ptr = pszNetworkID;
 	// Dispatch all NetwordIDValidatedListeners
-	get_networkid_validated_listener_manager()->call_listeners(pszUserName, pszNetworkID);
+	get_networkid_validated_listener_manager()->call_listeners(2, p1, p2);
 }

src/core/modules/listeners/client_put_in_server_listeners_wrap.cpp

@@ -35,25 +35,6 @@
 //-----------------------------------------------------------------------------
 static CClientPutInServerListenerManager s_ClientPutInServerListenerManager;
 
-//-----------------------------------------------------------------------------
-// Overload for passing the arguments
-//-----------------------------------------------------------------------------
-void CClientPutInServerListenerManager::call_listeners( edict_t *pEntity, char const *playername )
-{
-	for(int i = 0; i < m_vecCallables.Count(); i++)
-	{
-		BEGIN_BOOST_PY()
-
-			// Get the PyObject instance of the callable
-			PyObject* pCallable = m_vecCallables[i].ptr();
-
-			// Call the callable
-			CALL_PY_FUNC(pCallable, pEntity, playername);
-
-		END_BOOST_PY_NORET()
-	}
-}
-
 //-----------------------------------------------------------------------------
 // ClientPutInServerkListenerManager accessor.
 //-----------------------------------------------------------------------------

src/core/modules/listeners/client_put_in_server_listeners_wrap.h

@@ -38,7 +38,6 @@
 //-----------------------------------------------------------------------------
 class CClientPutInServerListenerManager: public CListenerManager
 {
-	void call_listeners( edict_t *pEntity, char const *playername );
 };
 
 CClientPutInServerListenerManager* get_client_put_in_server_listener_manager();

src/core/modules/listeners/level_init_listeners_wrap.cpp

@@ -35,25 +35,6 @@
 //-----------------------------------------------------------------------------
 static CLevelInitListenerManager s_LevelInitListenerManager;
 
-//-----------------------------------------------------------------------------
-// Overload for passing the arguments
-//-----------------------------------------------------------------------------
-void CLevelInitListenerManager::call_listeners( char const *pMapName )
-{
-	for(int i = 0; i < m_vecCallables.Count(); i++)
-	{
-		BEGIN_BOOST_PY()
-
-			// Get the PyObject instance of the callable
-			PyObject* pCallable = m_vecCallables[i].ptr();
-
-			// Call the callable
-			CALL_PY_FUNC(pCallable, pMapName);
-
-		END_BOOST_PY_NORET()
-	}
-}
-
 //-----------------------------------------------------------------------------
 // LevelInitListenerManager accessor.
 //-----------------------------------------------------------------------------

src/core/modules/listeners/level_init_listeners_wrap.h

@@ -38,7 +38,6 @@
 //-----------------------------------------------------------------------------
 class CLevelInitListenerManager: public CListenerManager
 {
-	void call_listeners( char const *pMapName );
 };
 
 CLevelInitListenerManager* get_level_init_listener_manager();

src/core/modules/listeners/listenermanager.cpp

@@ -4,6 +4,8 @@
 #include "listenermanager.h"
 #include "utility/call_python.h"
 #include "boost/python.hpp"
+#include "modules/entities/entities_wrap.h"
+#include <stdarg.h> // For va_list, va_end etc
 
 //-----------------------------------------------------------------------------
 // Adds a callable to the end of the CListenerManager vector.
@@ -36,30 +38,64 @@ void CListenerManager::unregister_listener(PyObject* pCallable)
 //-----------------------------------------------------------------------------
 // Calls all registered listeners.
 //-----------------------------------------------------------------------------
-// FSS No C++11 suport? In neither, VS2010 and VS2012?
-// template<typename... Types> void CListenerManager::call_listeners(typename... args)
-/* Other idea:
-typedef struct  {
-  int type;
-  union {
-    int int_value;
-    double double_value;
-    ...
-  };
-} Param;
-
-	boost::python::list lReturn = boost::python::list();
-
-	va_list varargs;
-
-	va_start(varargs, argc);
-	for (int i = 0; i < argc; i++)
+
+void CListenerManager::call_listeners(int argc, ...)
+{
+	if (argc > 0)
+	{
+		boost::python::dict dReturn = boost::python::dict();
+
+		va_list varargs;
+
+		va_start(varargs, argc);
+		for (int i = 0; i < argc; i++)
+		{
+		    Param p = va_arg(varargs, Param);
+			switch (p.type)
+			{
+				case CListenerManager::INTEGER:
+					dReturn[p.name] = p.int_value;
+					break;
+				case CListenerManager::CHAR:
+					dReturn[p.name] = p.char_ptr;
+					break;
+				case CListenerManager::EDICT_T:
+					dReturn[p.name] = CEdict(p.edict_t_ptr);
+			}
+		}
+		va_end(varargs);
+
+		for(int i = 0; i < m_vecCallables.Count(); i++)
+		{
+			BEGIN_BOOST_PY()
+
+				// Get the PyObject instance of the callable
+				PyObject* pCallable = m_vecCallables[i].ptr();
+
+				// Call the callable
+				CALL_PY_FUNC(pCallable, dReturn);
+
+			END_BOOST_PY_NORET()
+		}
+	}
+	else // For speed reasons (i.e. ticklistener) this sperate, so it doesn't create dictionary objects if no parameters are passed
 	{
-		lReturn.append<Param>(va_arg(varargs, Param));
+		for(int i = 0; i < m_vecCallables.Count(); i++)
+		{
+			BEGIN_BOOST_PY()
+
+				// Get the PyObject instance of the callable
+				PyObject* pCallable = m_vecCallables[i].ptr();
+
+				// Call the callable
+				CALL_PY_FUNC(pCallable);
+
+			END_BOOST_PY_NORET()
+		}
 	}
-	va_end;
-*/
+}
 
+/*
 void CListenerManager::call_listeners()
 {
 	for(int i = 0; i < m_vecCallables.Count(); i++)
@@ -91,3 +127,4 @@ void CListenerManager::call_listeners( edict_t *pEntity )
 		END_BOOST_PY_NORET()
 	}
 }
+*/

src/core/modules/listeners/listenermanager.h

@@ -15,12 +15,29 @@ class CListenerManager
 {
 public:
 
+	enum types {
+		INTEGER=0,
+		CHAR,
+		EDICT_T
+	};
+
+	struct Param {
+		int type;
+		const char* name; // For naming in the dict
+		union {
+			int int_value;
+			const char* char_ptr;
+			edict_t* edict_t_ptr;
+		};
+	};
+
 	void register_listener(PyObject* pCallable);
 	void unregister_listener(PyObject* pCallable);
 
-	void call_listeners();
+	void call_listeners(int argc, ...);
+	/*void call_listeners();
     // A lot of listener just pass an entity pointer
-    void call_listeners( edict_t *pEntity );
+    void call_listeners( edict_t *pEntity );*/
 
 protected:
 	CUtlVector<object> m_vecCallables;

src/core/modules/listeners/networkid_validated_listeners_wrap.cpp

@@ -35,25 +35,6 @@
 //-----------------------------------------------------------------------------
 static CNetworkIDValidatedListenerManager s_NetworkIDValidatedListenerManager;
 
-//-----------------------------------------------------------------------------
-// Overload for passing the arguments
-//-----------------------------------------------------------------------------
-void CNetworkIDValidatedListenerManager::call_listeners( const char *pszUserName, const char *pszNetworkID )
-{
-	for(int i = 0; i < m_vecCallables.Count(); i++)
-	{
-		BEGIN_BOOST_PY()
-
-			// Get the PyObject instance of the callable
-			PyObject* pCallable = m_vecCallables[i].ptr();
-
-			// Call the callable
-			CALL_PY_FUNC(pCallable, pszUserName, pszNetworkID);
-
-		END_BOOST_PY_NORET()
-	}
-}
-
 //-----------------------------------------------------------------------------
 // CNetworkIDValidatedListenerManager accessor.
 //-----------------------------------------------------------------------------

src/core/modules/listeners/networkid_validated_listeners_wrap.h

@@ -38,8 +38,6 @@
 //-----------------------------------------------------------------------------
 class CNetworkIDValidatedListenerManager: public CListenerManager
 {
-public:
-	void call_listeners( const char *pszUserName, const char *pszNetworkID );
 };
 
 CNetworkIDValidatedListenerManager* get_networkid_validated_listener_manager();

src/core/modules/listeners/on_query_cvar_value_finished_listeners_wrap.cpp

@@ -35,27 +35,6 @@
 //-----------------------------------------------------------------------------
 static COnQueryCvarValueFinishedListenerManager s_OnQueryCvarValueFinishedListenerManager;
 
-//-----------------------------------------------------------------------------
-// Overload for passing the arguments
-//-----------------------------------------------------------------------------
-void COnQueryCvarValueFinishedListenerManager::call_listeners( 
-    QueryCvarCookie_t iCookie, edict_t *pPlayerEntity,
-	EQueryCvarValueStatus eStatus, const char *pCvarName, const char *pCvarValue )
-{
-	for(int i = 0; i < m_vecCallables.Count(); i++)
-	{
-		BEGIN_BOOST_PY()
-
-			// Get the PyObject instance of the callable
-			PyObject* pCallable = m_vecCallables[i].ptr();
-
-			// Call the callable
-			CALL_PY_FUNC(pCallable, iCookie, pPlayerEntity, eStatus, pCvarName, pCvarValue);
-
-		END_BOOST_PY_NORET()
-	}
-}
-
 //-----------------------------------------------------------------------------
 // OnQueryCvarValueFinishedListenerManager accessor.
 //-----------------------------------------------------------------------------