- Eased creating listeners

- Fixed issue with sp credits

Author: Ayuto

addons/source-python/packages/source-python/_core/command.py

@@ -127,8 +127,7 @@ def delay_execution(*args):
     def print_version():
         '''Displays Source.Python version information.'''
 
-    @staticmethod
-    def print_credits():
+    def print_credits(self):
         '''Lists all credits for Source.Python.'''
 
         # Get header messages
@@ -156,7 +155,7 @@ def print_credits():
             message += '\n'
 
         # Print the message
-        _CoreCommandsLogger.log_message(message + '=' * 61 + '\n\n')
+        self.logger.log_message(message + '=' * 61 + '\n\n')
 
 SPSubCommandManager = _SPSubCommandManager('sp', 'Source.Python base command.')
 
@@ -176,4 +175,4 @@ def print_credits():
 SPSubCommandManager['list'] = SPSubCommandManager.print_plugins
 SPSubCommandManager['version'] = SPSubCommandManager.print_version
 SPSubCommandManager['credits'] = SPSubCommandManager.print_credits
-SPSubCommandManager['help'] = SPSubCommandManager.print_help
+SPSubCommandManager['help'] = SPSubCommandManager.print_help

src/CMakeLists.txt

@@ -249,12 +249,10 @@ Set(SOURCEPYTHON_PLAYERS_MODULE_SOURCES
 # Listener module
 # ------------------------------------------------------------------
 Set(SOURCEPYTHON_LISTENERS_MODULE_HEADERS
-    core/modules/listeners/listeners.h
     core/modules/listeners/listenermanager.h
 )
 
 Set(SOURCEPYTHON_LISTENERS_MODULE_SOURCES
-    core/modules/listeners/listeners.cpp
     core/modules/listeners/listenermanager.cpp
     core/modules/listeners/listeners_wrap_python.cpp
 )

src/core/addons/sp_addon.cpp

@@ -33,7 +33,8 @@
 #include "filesystem.h"
 #include "core/sp_gamedir.h"
 #include "utility/wrap_macros.h"
-#include "modules/listeners/listeners.h"
+#include "modules/listeners/listenermanager.h"
+#include "modules/entities/entities_wrap.h"
 
 //---------------------------------------------------------------------------------
 // External variables
@@ -66,27 +67,23 @@ CAddonManager::~CAddonManager( void )
 //---------------------------------------------------------------------------------
 void CAddonManager::GameFrame()
 {
-	// Dispatch all tick listeners
-	get_tick_listener_manager()->call_listeners();
+	CALL_LISTENERS(get_tick_listener_manager());
 }
 
 //---------------------------------------------------------------------------------
 // Calls network id validated listeners.
 //---------------------------------------------------------------------------------
 void CAddonManager::NetworkIDValidated( const char *pszUserName, const char *pszNetworkID )
 {
-	// Dispatch all NetwordIDValidatedListeners
-	get_networkid_validated_listener_manager()->call_listeners(pszUserName, pszNetworkID);
+	CALL_LISTENERS(get_networkid_validated_listener_manager(), pszUserName, pszNetworkID);
 }
 
-
 //---------------------------------------------------------------------------------
 // Calls level init listeners.
 //---------------------------------------------------------------------------------
 void CAddonManager::LevelInit( char const *pMapName )
 {
-	// Dispatch all LevelInit listeners
-	get_level_init_listener_manager()->call_listeners(pMapName);
+	CALL_LISTENERS(get_level_init_listener_manager(), pMapName);
 }
 
 //---------------------------------------------------------------------------------
@@ -95,54 +92,52 @@ void CAddonManager::LevelInit( char const *pMapName )
 // TODO: will not work if this is really a list
 void CAddonManager::ServerActivate( edict_t *pEdictList, int edictCount, int clientMax )
 {
-	// Dispatch all LevelInit listeners
-	get_server_activate_listener_manager()->call_listeners(pEdictList, edictCount, clientMax);
+	CEdict edict = CEdict(pEdictList);
+	CALL_LISTENERS(get_server_activate_listener_manager(), edict, edictCount, clientMax);
 }
 
 //---------------------------------------------------------------------------------
 // Calls level shutdown listeners.
 //---------------------------------------------------------------------------------
 void CAddonManager::LevelShutdown( void )
 {
-    // Dispatch all tick listeners
-	get_level_shutdown_listener_manager()->call_listeners();
+	CALL_LISTENERS(get_level_shutdown_listener_manager());
 }
 
-
 //---------------------------------------------------------------------------------
 // Calls client active listeners.
 //---------------------------------------------------------------------------------
 void CAddonManager::ClientActive( edict_t *pEntity )
 {
-	// Dispatch all LevelInit listeners
-	get_client_active_listener_manager()->call_listeners(pEntity);
+	CEdict edict = CEdict(pEntity);
+	CALL_LISTENERS(get_client_active_listener_manager(), edict);
 }
 
 //---------------------------------------------------------------------------------
 // Calls client disconnect listeners.
 //---------------------------------------------------------------------------------
 void CAddonManager::ClientDisconnect( edict_t *pEntity )
 {
-	// Dispatch all LevelInit listeners
-	get_client_disconnect_listener_manager()->call_listeners(pEntity);
+	CEdict edict = CEdict(pEntity);
+	CALL_LISTENERS(get_client_disconnect_listener_manager(), edict);
 }
 
 //---------------------------------------------------------------------------------
 // Calls client put in server listeners.
 //---------------------------------------------------------------------------------
 void CAddonManager::ClientPutInServer( edict_t *pEntity, char const *playername )
 {
-	// Dispatch all LevelInit listeners
-	get_client_put_in_server_listener_manager()->call_listeners(pEntity, playername);
+	CEdict edict = CEdict(pEntity);
+	CALL_LISTENERS(get_client_put_in_server_listener_manager(), edict, playername);
 }
 
 //---------------------------------------------------------------------------------
 // Calls client settings changed listeners.
 //---------------------------------------------------------------------------------
 void CAddonManager::ClientSettingsChanged( edict_t *pEdict )
 {
-	// Dispatch all LevelInit listeners
-	get_client_settings_changed_listener_manager()->call_listeners(pEdict);
+	CEdict edict = CEdict(pEdict);
+	CALL_LISTENERS(get_client_settings_changed_listener_manager(), edict);
 }
 
 //---------------------------------------------------------------------------------
@@ -151,8 +146,8 @@ void CAddonManager::ClientSettingsChanged( edict_t *pEdict )
 void CAddonManager::ClientConnect( bool *bAllowConnect, edict_t *pEntity, 
 	const char *pszName, const char *pszAddress, char *reject, int maxrejectlen )
 {
-	// Dispatch all LevelInit listeners
-	get_client_connect_listener_manager()->call_listeners(bAllowConnect, pEntity, pszName, pszAddress, reject, maxrejectlen);
+	CEdict edict = CEdict(pEntity);
+	CALL_LISTENERS(get_client_connect_listener_manager(), *bAllowConnect, edict, pszName, pszAddress, reject, maxrejectlen);
 }
 
 //---------------------------------------------------------------------------------
@@ -162,29 +157,28 @@ void CAddonManager::OnQueryCvarValueFinished( QueryCvarCookie_t iCookie,
 	edict_t *pPlayerEntity, EQueryCvarValueStatus eStatus, const char *pCvarName, 
 	const char *pCvarValue )
 {
-
-	// Dispatch all LevelInit listeners
-	get_client_fully_connect_listener_manager()->call_listeners(iCookie, pPlayerEntity, eStatus, pCvarName, pCvarValue);
+	CEdict edict = CEdict(pPlayerEntity);
+	CALL_LISTENERS(get_on_query_cvar_value_finished_listener_manager(), (int) iCookie, edict, eStatus, pCvarName, pCvarValue);
 }
 //
 // 
 //
 #if(SOURCE_ENGINE >= 3)
 void CAddonManager::ClientFullyConnect( edict_t *pEntity )
 {
-	// Dispatch all LevelInit listeners
-	get_client_fully_connect_listener_manager()->call_listeners(pEntity);
+	CEdict edict = CEdict(pEntity);
+	CALL_LISTENERS(get_client_fully_connect_listener_manager(), edict);
 }
 
 void CAddonManager::OnEdictAllocated( edict_t *edict )
 {
-	// Dispatch all LevelInit listeners
-	get_on_edict_allocated_listener_manager()->call_listeners(edict);
+	CEdict edict = CEdict(pEntity);
+	CALL_LISTENERS(get_on_edict_allocated_listener_manager(), edict);
 }
 
 void CAddonManager::OnEdictFreed( const edict_t *edict )
 {
-	// Dispatch all LevelInit listeners
-	get_on_edict_freed_listener_manager()->call_listeners(const_cast<edict_t*>(edict));
+	CEdict edict = CEdict(pEntity);
+	CALL_LISTENERS(get_on_edict_freed_listener_manager(), edict);
 }
 #endif

src/core/modules/listeners/listenermanager.cpp

@@ -2,23 +2,7 @@
 // Includes
 //-----------------------------------------------------------------------------
 #include "listenermanager.h"
-#include "utility/call_python.h"
-#include "boost/python.hpp"
-#include "modules/entities/entities_wrap.h"
 
-//-----------------------------------------------------------------------------
-// Macros
-//-----------------------------------------------------------------------------
-
-#define BEGIN_CALL_LISTENER() \
-	for(int i = 0; i < m_vecCallables.Count(); i++) \
-	{ \
-		BEGIN_BOOST_PY() \
-			PyObject* pCallable = m_vecCallables[i].ptr(); \
-
-#define END_CALL_LISTENER( ... ) \
-	    END_BOOST_PY_NORET() \
-	} 
 
 //-----------------------------------------------------------------------------
 // Adds a callable to the end of the CListenerManager vector.
@@ -46,90 +30,4 @@ void CListenerManager::unregister_listener(PyObject* pCallable)
 
 	// Remove the callback from the ServerCommandManager instance
 	m_vecCallables.FindAndRemove(oCallable);
-}
-
-//-----------------------------------------------------------------------------
-// Calls all registered listeners.
-//-----------------------------------------------------------------------------
-
-void CListenerManager::call_listeners()
-{
-	BEGIN_CALL_LISTENER()
-		CALL_PY_FUNC(pCallable);
-	END_CALL_LISTENER()
-}
-
-void CListenerManager::call_listeners( edict_t *pEntity )
-{
-	CEdict *entity = new CEdict(pEntity); 
-
-	BEGIN_CALL_LISTENER()
-		// Call the callable
-		CALL_PY_FUNC(pCallable, entity);
-	END_CALL_LISTENER()
-}
-
-// LevelIinit
-void CListenerManager::call_listeners(char const *pMapName)
-{
-	BEGIN_CALL_LISTENER()
-		// Call the callable
-		CALL_PY_FUNC(pCallable, pMapName);
-	END_CALL_LISTENER()
-}
-
-// ClientFullyConnect
-void CListenerManager::call_listeners( edict_t *pEntity, const char *playername )
-{
-	CEdict *entity = new CEdict(pEntity); 
-
-	BEGIN_CALL_LISTENER()
-		// Call the callable
-		CALL_PY_FUNC(pCallable, entity, playername);
-	END_CALL_LISTENER()
-}
-
-// NetworkID
-void CListenerManager::call_listeners(const char *pszUserName, const char *pszNetworkID)
-{
-	BEGIN_CALL_LISTENER()
-		// Call the callable
-		CALL_PY_FUNC(pCallable, pszUserName, pszNetworkID);
-	END_CALL_LISTENER()
-}
-
-// ServerActivate
-void CListenerManager::call_listeners(edict_t *pEdictList, int edictCount, int clientMax)
-{
-	// TODO? Edictlist
-	CEdict *entity = new CEdict(pEdictList); 
-
-	BEGIN_CALL_LISTENER()
-		CALL_PY_FUNC(pCallable, entity, edictCount, clientMax);
-	END_CALL_LISTENER()
-}
-// ClientConnect
-void CListenerManager::call_listeners(bool *bAllowConnect, edict_t *pEntity, 
-	const char *pszName, const char *pszAddress, char *reject, 
-	int maxrejectlen)
-{
-	bool bAllowConnect_safe = &bAllowConnect;
-	CEdict *entity = new CEdict(pEntity); 
-	const char *reject_safe = reject;
-
-	BEGIN_CALL_LISTENER()
-		CALL_PY_FUNC(pCallable, bAllowConnect_safe, entity, pszName, pszAddress, reject_safe, maxrejectlen);
-	END_CALL_LISTENER()
-}
-// OnQueryCvarValueFinished
-void CListenerManager::call_listeners(QueryCvarCookie_t iCookie, edict_t *pPlayerEntity, 
-	EQueryCvarValueStatus eStatus, const char *pCvarName, 
-	const char *pCvarValue)
-{
-	int cookie = (int)iCookie;
-	CEdict *entity = new CEdict(pPlayerEntity);
-
-	BEGIN_CALL_LISTENER()
-		CALL_PY_FUNC(pCallable, cookie, entity, eStatus, pCvarName, pCvarValue);
-	END_CALL_LISTENER()
 }