Changed CPlayerGenerator and CEntityGenerator to PlayerGenerator and EntityGenerator. Made appropriate changes within the Python API for this name change.

Changed C++ side <type>CommandManager objects to <type>CommandDispatcher.  This was done because Python already has <type>CommandManager classes, and we want to avoid duplicate names.

Author: satoon101

addons/source-python/packages/source-python/filters/players.py

@@ -8,7 +8,7 @@
 from configobj import ConfigObj
 
 # Source.Python Imports
-from player_c import CPlayerGenerator
+from player_c import PlayerGenerator
 from core import GameEngine
 from core import GAME_NAME
 from paths import SP_DATA_PATH
@@ -54,7 +54,7 @@ class PlayerIter(_IterObject):
     manager = PlayerIterManager
 
     # Store the base iterator
-    iterator = staticmethod(CPlayerGenerator)
+    iterator = staticmethod(PlayerGenerator)
 
 
 # =============================================================================

addons/source-python/packages/source-python/filters/weapons.py

@@ -4,7 +4,7 @@
 # >> IMPORTS
 # =============================================================================
 # Source.Python Imports
-from entity_c import CEntityGenerator
+from entity_c import EntityGenerator
 from public import public
 #   Entities
 from entities.entity import BaseEntity
@@ -41,7 +41,7 @@ def iterator():
         '''Iterates over only weapon entities'''
 
         # Loop through all entities on the server
-        for edict in CEntityGenerator():
+        for edict in EntityGenerator():
 
             # Is the entity a weapon?
             if edict.get_class_name() in WeaponManager:

addons/source-python/packages/source-python/players/games/csgo.py

@@ -4,7 +4,7 @@
 # >> IMPORTS
 # =============================================================================
 # Source.Python Imports
-from entity_c import CEntityGenerator
+from entity_c import EntityGenerator
 #   Entities
 from entities.entity import BaseEntity
 from entities.helpers import index_from_edict
@@ -100,7 +100,7 @@ def has_c4(self):
         '''Returns whether or not the player is carrying C4'''
 
         # Loop through all c4 entities on the server
-        for edict in CEntityGenerator('weapon_c4'):
+        for edict in EntityGenerator('weapon_c4'):
 
             # Get the entity's index
             index = index_from_edict(edict)

src/core/modules/commands/command_wrap_python.cpp

@@ -159,7 +159,7 @@ BOOST_PYTHON_FUNCTION_OVERLOADS( get_server_command_overloads, GetServerCommand,
 void export_server_command()
 {
 	// TODO: Rename
-	class_<CServerCommandManager, boost::noncopyable>("ServerCommandManager", no_init)
+	class_<CServerCommandManager, boost::noncopyable>("ServerCommandDispatcher", no_init)
 		.def("add_callback",
 			&CServerCommandManager::AddCallback,
 			"Adds a callback to the server command's list.",
@@ -175,7 +175,7 @@ void export_server_command()
 
 	def("get_server_command",
 		GetServerCommand,
-		get_server_command_overloads("Gets the ServerCommandManager instance using just the name or also the helptext and/or flags",
+		get_server_command_overloads("Gets the ServerCommandDispatcher instance using just the name or also the helptext and/or flags",
 			args("name", "help_text", "flags")
 		)[reference_existing_object_policy()]
 	);
@@ -187,7 +187,7 @@ void export_server_command()
 void export_client_command()
 {
 	// TODO: Rename
-	class_<CClientCommandManager, boost::noncopyable>("ClientCommandManager", no_init)
+	class_<CClientCommandManager, boost::noncopyable>("ClientCommandDispatcher", no_init)
 		.def("add_callback",
 			&CClientCommandManager::AddCallback,
 			"Adds a callback to the client command's list.",
@@ -203,7 +203,7 @@ void export_client_command()
 
 	def("get_client_command",
 		GetClientCommand,
-		"Returns the ClientCommandManager instance for the given command",
+		"Returns the ClientCommandDispatcher instance for the given command",
 		args("name"),
 		reference_existing_object_policy()
 	);
@@ -227,7 +227,7 @@ void export_client_command()
 void export_say_command()
 {
 	// TODO: Rename
-	class_<CSayCommandManager, boost::noncopyable>("SayCommandManager", no_init)
+	class_<CSayCommandManager, boost::noncopyable>("SayCommandDispatcher", no_init)
 		.def("add_callback",
 			&CSayCommandManager::AddCallback,
 			"Adds a callback to the say command's list.",
@@ -243,7 +243,7 @@ void export_say_command()
 
 	def("get_say_command",
 		GetSayCommand,
-		"Returns the SayCommandManager instance for the given command",
+		"Returns the SayCommandDispatcher instance for the given command",
 		args("name"),
 		reference_existing_object_policy()
 	);

src/core/modules/entities/entities_generator_wrap.cpp

@@ -33,9 +33,9 @@
 #include "boost/python/iterator.hpp"
 
 // ----------------------------------------------------------------------------
-// CEntityGenerator Constructor.
+// EntityGenerator Constructor.
 // ----------------------------------------------------------------------------
-CEntityGenerator::CEntityGenerator( PyObject* self ):
+EntityGenerator::EntityGenerator( PyObject* self ):
 	IPythonGenerator<edict_t>(self),
 	m_iEntityIndex(0),
 	m_szClassName(NULL),
@@ -45,9 +45,9 @@ CEntityGenerator::CEntityGenerator( PyObject* self ):
 }
 
 // ----------------------------------------------------------------------------
-// CEntityGenerator Copy-Constructor.
+// EntityGenerator Copy-Constructor.
 // ----------------------------------------------------------------------------
-CEntityGenerator::CEntityGenerator( PyObject* self, const CEntityGenerator& rhs ):
+EntityGenerator::EntityGenerator( PyObject* self, const EntityGenerator& rhs ):
 	IPythonGenerator<edict_t>(self),
 	m_iEntityIndex(rhs.m_iEntityIndex),
 	m_uiClassNameLen(rhs.m_uiClassNameLen),
@@ -57,9 +57,9 @@ CEntityGenerator::CEntityGenerator( PyObject* self, const CEntityGenerator& rhs
 }
 
 // ----------------------------------------------------------------------------
-// CEntityGenerator Constructor (takes a filter string).
+// EntityGenerator Constructor (takes a filter string).
 // ----------------------------------------------------------------------------
-CEntityGenerator::CEntityGenerator(PyObject* self, const char* szClassName):
+EntityGenerator::EntityGenerator(PyObject* self, const char* szClassName):
 	IPythonGenerator<edict_t>(self),
 	m_iEntityIndex(0),
 	m_uiClassNameLen(strlen(szClassName)),
@@ -69,9 +69,9 @@ CEntityGenerator::CEntityGenerator(PyObject* self, const char* szClassName):
 }
 
 // ----------------------------------------------------------------------------
-// CEntityGenerator Constructor (takes a filter string and a boolean flag).
+// EntityGenerator Constructor (takes a filter string and a boolean flag).
 // ----------------------------------------------------------------------------
-CEntityGenerator::CEntityGenerator(PyObject* self, const char* szClassName, bool bExactMatch):
+EntityGenerator::EntityGenerator(PyObject* self, const char* szClassName, bool bExactMatch):
 	IPythonGenerator<edict_t>(self),
 	m_iEntityIndex(0),
 	m_uiClassNameLen(strlen(szClassName)),
@@ -81,17 +81,17 @@ CEntityGenerator::CEntityGenerator(PyObject* self, const char* szClassName, bool
 }
 
 // ----------------------------------------------------------------------------
-// CEntityGenerator Destructor.
+// EntityGenerator Destructor.
 // ----------------------------------------------------------------------------
-CEntityGenerator::~CEntityGenerator()
+EntityGenerator::~EntityGenerator()
 {
 	delete[] m_szClassName;
 }
 
 // ----------------------------------------------------------------------------
 // Returns the next valid edict_t instance.
 // ----------------------------------------------------------------------------
-edict_t* CEntityGenerator::getNext()
+edict_t* EntityGenerator::getNext()
 {
 	edict_t* pEdict = NULL;
 	while(m_iEntityIndex < gpGlobals->maxEntities)
@@ -124,7 +124,7 @@ edict_t* CEntityGenerator::getNext()
 //---------------------------------------------------------------------------------
 // Private function, creates a copy of the class name string.
 //---------------------------------------------------------------------------------
-void CEntityGenerator::makeStringCopy(const char* szClassName, unsigned int uiClassNameLen)
+void EntityGenerator::makeStringCopy(const char* szClassName, unsigned int uiClassNameLen)
 {
 	if (uiClassNameLen > 0)
 	{

src/core/modules/entities/entities_generator_wrap.h

@@ -41,14 +41,14 @@ struct edict_t;
 // ----------------------------------------------------------------------------
 // Declare the generator class.
 // ----------------------------------------------------------------------------
-class CEntityGenerator: public IPythonGenerator<edict_t>
+class EntityGenerator: public IPythonGenerator<edict_t>
 {
 public:
-	CEntityGenerator(PyObject* self);
-	CEntityGenerator(PyObject* self, const CEntityGenerator& rhs);
-	CEntityGenerator(PyObject* self, const char* szClassName);
-	CEntityGenerator(PyObject* self, const char* szClassName, bool exactMatch);
-	virtual ~CEntityGenerator();
+	EntityGenerator(PyObject* self);
+	EntityGenerator(PyObject* self, const EntityGenerator& rhs);
+	EntityGenerator(PyObject* self, const char* szClassName);
+	EntityGenerator(PyObject* self, const char* szClassName, bool exactMatch);
+	virtual ~EntityGenerator();
 
 protected:
 	virtual edict_t* getNext();
@@ -61,6 +61,6 @@ class CEntityGenerator: public IPythonGenerator<edict_t>
 	bool m_bExactMatch;
 };
 
-BOOST_SPECIALIZE_HAS_BACK_REFERENCE(CEntityGenerator)
+BOOST_SPECIALIZE_HAS_BACK_REFERENCE(EntityGenerator)
 
 #endif

src/core/modules/entities/entities_wrap_python.cpp

@@ -445,12 +445,12 @@ void export_edict()
 }
 
 //-----------------------------------------------------------------------------
-// Exports CEntityGenerator.
+// Exports EntityGenerator.
 //-----------------------------------------------------------------------------
 void export_entity_generator()
 {
 	// TODO: Rename
-	BOOST_GENERATOR_CLASS(CEntityGenerator)
+	BOOST_GENERATOR_CLASS(EntityGenerator)
 		CLASS_CONSTRUCTOR(const char*)
 		CLASS_CONSTRUCTOR(const char*, bool)
 	BOOST_END_CLASS()

src/core/modules/players/players_generator_wrap.cpp

@@ -38,34 +38,34 @@
 extern IPlayerInfoManager* playerinfomanager;
 
 // ----------------------------------------------------------------------------
-// CPlayerGenerator Constructor.
+// PlayerGenerator Constructor.
 // ----------------------------------------------------------------------------
-CPlayerGenerator::CPlayerGenerator( PyObject* self ):
+PlayerGenerator::PlayerGenerator( PyObject* self ):
 	IPythonGenerator<IPlayerInfo>(self),
 	m_iEntityIndex(0)
 {
 }
 
 // ----------------------------------------------------------------------------
-// CPlayerGenerator Copy-Constructor.
+// PlayerGenerator Copy-Constructor.
 // ----------------------------------------------------------------------------
-CPlayerGenerator::CPlayerGenerator( PyObject* self, const CPlayerGenerator& rhs ):
+PlayerGenerator::PlayerGenerator( PyObject* self, const PlayerGenerator& rhs ):
 	IPythonGenerator<IPlayerInfo>(self),
 	m_iEntityIndex(rhs.m_iEntityIndex)
 {
 }
 
 // ----------------------------------------------------------------------------
-// CPlayerGenerator Destructor.
+// PlayerGenerator Destructor.
 // ----------------------------------------------------------------------------
-CPlayerGenerator::~CPlayerGenerator()
+PlayerGenerator::~PlayerGenerator()
 {
 }
 
 // ----------------------------------------------------------------------------
 // Returns the next valid IPlayerInfo instance.
 // ----------------------------------------------------------------------------
-IPlayerInfo* CPlayerGenerator::getNext()
+IPlayerInfo* PlayerGenerator::getNext()
 {
 	IPlayerInfo* pPlayerInfo = NULL;
 	while(m_iEntityIndex < gpGlobals->maxClients)

src/core/modules/players/players_generator_wrap.h

@@ -41,12 +41,12 @@ class IPlayerInfo;
 // ----------------------------------------------------------------------------
 // Declare the generator class.
 // ----------------------------------------------------------------------------
-class CPlayerGenerator: public IPythonGenerator<IPlayerInfo>
+class PlayerGenerator: public IPythonGenerator<IPlayerInfo>
 {
 public:
-	CPlayerGenerator(PyObject* self);
-	CPlayerGenerator(PyObject* self, const CPlayerGenerator& rhs);
-	virtual ~CPlayerGenerator();
+	PlayerGenerator(PyObject* self);
+	PlayerGenerator(PyObject* self, const PlayerGenerator& rhs);
+	virtual ~PlayerGenerator();
 
 protected:
 	virtual IPlayerInfo* getNext();
@@ -55,6 +55,6 @@ class CPlayerGenerator: public IPythonGenerator<IPlayerInfo>
 	int m_iEntityIndex;
 };
 
-BOOST_SPECIALIZE_HAS_BACK_REFERENCE(CPlayerGenerator)
+BOOST_SPECIALIZE_HAS_BACK_REFERENCE(PlayerGenerator)
 
 #endif

src/core/modules/players/players_wrap_python.cpp

@@ -198,6 +198,6 @@ void export_netinfo()
 
 void export_player_generator()
 {
-	BOOST_GENERATOR_CLASS(CPlayerGenerator)
+	BOOST_GENERATOR_CLASS(PlayerGenerator)
 	BOOST_END_CLASS()
 }