Fixed listeners

- Fixed listener manager "ServerActivate"

Author: Ayuto

src/core/addons/sp_addon.cpp

@@ -89,10 +89,13 @@ void CAddonManager::LevelInit( char const *pMapName )
 //---------------------------------------------------------------------------------
 // Calls server activate listeners.
 //---------------------------------------------------------------------------------
-// TODO: will not work if this is really a list
 void CAddonManager::ServerActivate( edict_t *pEdictList, int edictCount, int clientMax )
 {
-	CALL_LISTENERS(ServerActivate, pEdictList, edictCount, clientMax);
+	list edicts;
+	for(int i=0; i < edictCount; i++)
+		edicts.append(pEdictList[i]);
+	
+	CALL_LISTENERS(ServerActivate, edicts, edictCount, clientMax);
 }
 
 //---------------------------------------------------------------------------------

src/core/modules/listeners/listenermanager.h

@@ -12,21 +12,21 @@
 //-----------------------------------------------------------------------------
 // Macros
 //-----------------------------------------------------------------------------
-// This creates a static manager (only visible in file that uses this macro)
-// and an inline function that returns a pointer to the manager. That way we
-// avoid multiple definitions
+// This creates a static manager and an inline function that returns a pointer
+// to the manager. Must be used in a *.cpp file!
 #define DEFINE_MANAGER_ACCESSOR(name) \
 	static CListenerManager s_##name; \
 	inline CListenerManager* Get##name##ListenerManager() \
 	{ return &s_##name; }
 
 // Calls all listeners of the given manager
-#define CALL_LISTENERS(manager, ...) \
-	for(int i = 0; i < s_##manager.m_vecCallables.Count(); i++) \
+#define CALL_LISTENERS(name, ...) \
+	extern CListenerManager* Get##name##ListenerManager(); \
+	for(int i = 0; i < Get##name##ListenerManager()->m_vecCallables.Count(); i++) \
 	{ \
 		BEGIN_BOOST_PY() \
-		CALL_PY_FUNC(s_##manager.m_vecCallables[i].ptr(), ##__VA_ARGS__); \
-	    END_BOOST_PY_NORET() \
+			CALL_PY_FUNC(Get##name##ListenerManager()->m_vecCallables[i].ptr(), ##__VA_ARGS__); \
+		END_BOOST_PY_NORET() \
 	}
 
 
@@ -43,20 +43,4 @@ class CListenerManager
 	CUtlVector<object> m_vecCallables;
 };
 
-// Create manager accessor functions
-DEFINE_MANAGER_ACCESSOR(ClientActive)
-DEFINE_MANAGER_ACCESSOR(ClientConnect)
-DEFINE_MANAGER_ACCESSOR(ClientDisconnect)
-DEFINE_MANAGER_ACCESSOR(ClientFullyConnect)
-DEFINE_MANAGER_ACCESSOR(ClientPutInServer)
-DEFINE_MANAGER_ACCESSOR(ClientSettingsChanged)
-DEFINE_MANAGER_ACCESSOR(LevelInit)
-DEFINE_MANAGER_ACCESSOR(LevelShutdown)
-DEFINE_MANAGER_ACCESSOR(NetworkidValidated)
-DEFINE_MANAGER_ACCESSOR(OnEdictAllocated)
-DEFINE_MANAGER_ACCESSOR(OnEdictFreed)
-DEFINE_MANAGER_ACCESSOR(OnQueryCvarValueFinished)
-DEFINE_MANAGER_ACCESSOR(ServerActivate)
-DEFINE_MANAGER_ACCESSOR(Tick)
-
 #endif // _LISTENERMANAGER_H

src/core/modules/listeners/listeners_wrap_python.cpp

@@ -31,14 +31,28 @@
 #include "utility/wrap_macros.h"
 #include "listenermanager.h"
 
-//-----------------------------------------------------------------------------
-// Functions that expose tick listener functionality to us.
-//-----------------------------------------------------------------------------
-void export_listener_managers();
+
+// Create manager accessor functions
+DEFINE_MANAGER_ACCESSOR(ClientActive)
+DEFINE_MANAGER_ACCESSOR(ClientConnect)
+DEFINE_MANAGER_ACCESSOR(ClientDisconnect)
+DEFINE_MANAGER_ACCESSOR(ClientFullyConnect)
+DEFINE_MANAGER_ACCESSOR(ClientPutInServer)
+DEFINE_MANAGER_ACCESSOR(ClientSettingsChanged)
+DEFINE_MANAGER_ACCESSOR(LevelInit)
+DEFINE_MANAGER_ACCESSOR(LevelShutdown)
+DEFINE_MANAGER_ACCESSOR(NetworkidValidated)
+DEFINE_MANAGER_ACCESSOR(OnEdictAllocated)
+DEFINE_MANAGER_ACCESSOR(OnEdictFreed)
+DEFINE_MANAGER_ACCESSOR(OnQueryCvarValueFinished)
+DEFINE_MANAGER_ACCESSOR(ServerActivate)
+DEFINE_MANAGER_ACCESSOR(Tick)
 
 //-----------------------------------------------------------------------------
 // Exposes the listener_c module.
 //-----------------------------------------------------------------------------
+void export_listener_managers();
+
 DECLARE_SP_MODULE(listener_c)
 {
 	export_listener_managers();
@@ -56,7 +70,7 @@ void export_listener_managers()
 			args("callable")
 		)
 
-		.def("register_listener",
+		.def("unregister_listener",
 			&CListenerManager::UnregisterListener,
 			"Removes a callable object. If it was not registered nothing will happen.",
 			args("callable")