Removed unecessary MRecipientFilter wrap

Author: Ayuto

src/CMakeLists.txt

@@ -261,12 +261,10 @@ Set(SOURCEPYTHON_PLAYERS_MODULE_SOURCES
 # ------------------------------------------------------------------
 Set(SOURCEPYTHON_RECIPIENTFILTER_MODULE_HEADERS
     core/modules/recipientfilters/mrecipientfilter.h
-    core/modules/recipientfilters/mrecipientfilter_wrap.h
 )
 
 Set(SOURCEPYTHON_RECIPIENTFILTER_MODULE_SOURCES
     core/modules/recipientfilters/mrecipientfilter.cpp
-    core/modules/recipientfilters/mrecipientfilter_wrap.cpp
     core/modules/recipientfilters/mrecipientfilter_wrap_python.cpp
 )
 

src/core/modules/recipientfilters/mrecipientfilter_wrap.cpp

@@ -28,78 +28,69 @@
 */
 
 #include "modules/export_main.h"
-#include "mrecipientfilter_wrap.h"
-
-//---------------------------------------------------------------------------------
-// Namespaces to use
-//---------------------------------------------------------------------------------
-using namespace boost::python;
-
-//---------------------------------------------------------------------------------
-// Exposer functions.
-//---------------------------------------------------------------------------------
-void export_mrecipientfilter_interface();
+#include "mrecipientfilter.h"
 
 //---------------------------------------------------------------------------------
 // Exposes the engine module.
 //---------------------------------------------------------------------------------
+void export_mrecipientfilter();
+
 DECLARE_SP_MODULE(recipientfilter_c)
 {
-	export_mrecipientfilter_interface();
+	export_mrecipientfilter();
 }
 
-void export_mrecipientfilter_interface()
+void export_mrecipientfilter()
 {
-	BOOST_CLASS_NOCOPY( CMRecipientFilter )
-
-		CLASS_METHOD(CMRecipientFilter,
-			is_reliable,
+	// TODO: Rename class
+	class_<MRecipientFilter, boost::noncopyable>("CMRecipientFilter")
+		.def("is_reliable",
+			&MRecipientFilter::IsReliable,
 			"Whether this recipient filter will be network reliable (sent in-order)"
 		)
 
-		CLASS_METHOD(CMRecipientFilter,
-			is_init_message,
+		.def("is_init_message",
+			&MRecipientFilter::IsInitMessage,
 			"Whether the message has been initialised?"
 		)
 
-		CLASS_METHOD(CMRecipientFilter,
-			get_recipient_count,
+		.def("get_recipient_count",
+			&MRecipientFilter::GetRecipientCount,
 			"Obtain the amount of clients in this filter"
 		)
 
-		CLASS_METHOD(CMRecipientFilter,
-			get_recipient_index,
+		.def("get_recipient_index",
+			&MRecipientFilter::GetRecipientIndex,
 			"Obtains the player index at the slot in the filter",
 			args("slot")
 		)
 
-		CLASS_METHOD(CMRecipientFilter,
-			add_all_players,
+		.def("add_all_players",
+			&MRecipientFilter::AddAllPlayers,
 			"Adds all the players on the server to the filter"
 		)
 
-		CLASS_METHOD(CMRecipientFilter,
-			add_recipient,
+		.def("add_recipient",
+			&MRecipientFilter::AddRecipient,
 			"Adds the index of the player to the filter",
 			args("iPlayer")
 		)
 
-		CLASS_METHOD(CMRecipientFilter,
-			remove_all_players,
+		.def("remove_all_players",
+			&MRecipientFilter::RemoveAllPlayers,
 			"Removes all the players on the server from the filter"
 		)
 
-		CLASS_METHOD(CMRecipientFilter,
-			remove_recipient,
+		.def("remove_recipient",
+			&MRecipientFilter::RemoveRecipient,
 			"Removes the index of the player from the filter",
 			args("iPlayer")
 		)
 
-		CLASS_METHOD(CMRecipientFilter,
-			has_recipient,
+		.def("has_recipient",
+			&MRecipientFilter::HasRecipient,
 			"Returns true if the given index is in the recipient, false otherwise.",
 			args("iPlayer")
 		)
-		
-	BOOST_END_CLASS()
+	;
 }

src/core/modules/recipientfilters/mrecipientfilter_wrap.h

@@ -30,7 +30,7 @@
 #include "public/game/shared/csgo/protobuf/cstrike15_usermessages.pb.h"
 #include "public/game/shared/csgo/protobuf/cstrike15_usermessage_helpers.h"
 
-CUserMessageImplementation::CUserMessageImplementation( const CMRecipientFilter &recipient_filter, const char *message_name ) :
+CUserMessageImplementation::CUserMessageImplementation( const MRecipientFilter &recipient_filter, const char *message_name ) :
 	IUsermessageImplementationBase(recipient_filter, message_name),
 	m_message(NULL)
 {
@@ -50,7 +50,7 @@ void CUserMessageImplementation::send_message_internal()
 {
 	if (m_message != NULL  && m_message_index != -1)
 	{
-		engine->SendUserMessage(const_cast<CMRecipientFilter&>(m_recipient_filter), m_message_index, *m_message);
+		engine->SendUserMessage(const_cast<MRecipientFilter&>(m_recipient_filter), m_message_index, *m_message);
 	}
 	else
 	{

src/core/modules/recipientfilters/mrecipientfilter_wrap_python.cpp

@@ -35,7 +35,7 @@
 class CUserMessageImplementation : public IUsermessageImplementationBase
 {
 public:
-	CUserMessageImplementation( const CMRecipientFilter &recipient_filter, const char *message_name);
+	CUserMessageImplementation( const MRecipientFilter &recipient_filter, const char *message_name);
 
 	// Pure-virtual methods which must be inherited and overwritten in the inherited
 	// classes

src/core/modules/usermessage/csgo/usermessage_implementation.cpp

@@ -26,15 +26,15 @@
 
 #include "usermessage_implementation.h"
 
-CUserMessageImplementation::CUserMessageImplementation(const CMRecipientFilter &recipient_filter, const char *message_name ) :
+CUserMessageImplementation::CUserMessageImplementation(const MRecipientFilter &recipient_filter, const char *message_name ) :
 IUsermessageImplementationBase(recipient_filter, message_name)
 {
 	// Set the message index.
 	set_message_index();
 
 	// TODO - Check if we should pass this as a non-const so we don't have to const-cast it. I'm sure I saw a constructor
 	// somewhere requiring this to be passed as a const-ref somewhere
-	m_buffer = engine->UserMessageBegin(&const_cast<CMRecipientFilter&>(recipient_filter), m_message_index);
+	m_buffer = engine->UserMessageBegin(&const_cast<MRecipientFilter&>(recipient_filter), m_message_index);
 }
 
 void CUserMessageImplementation::send_message_internal()

src/core/modules/usermessage/csgo/usermessage_implementation.h

@@ -36,7 +36,7 @@ extern IServerGameDLL *servergamedll;
 class CUserMessageImplementation : public IUsermessageImplementationBase
 {
 public:
-	CUserMessageImplementation(const CMRecipientFilter &recipient_filter, const char *message_name);
+	CUserMessageImplementation(const MRecipientFilter &recipient_filter, const char *message_name);
 
 	// Pure-virtual methods which must be inherited and overwritten in the inherited
 	// classes

src/core/modules/usermessage/ob/usermessage_implementation.cpp

@@ -26,7 +26,7 @@
 
 #include "usermessage.h"
 
-CUserMessage::CUserMessage(const CMRecipientFilter &recipient_filter, const char *message_name ) :
+CUserMessage::CUserMessage(const MRecipientFilter &recipient_filter, const char *message_name ) :
 	CUserMessageImplementation(recipient_filter, message_name),
 	m_sent(false)
 {
@@ -61,7 +61,7 @@ const int CUserMessage::get_message_index() const
 	return m_message_index;
 }
 
-const CMRecipientFilter & CUserMessage::get_recipient_filter() const
+const MRecipientFilter & CUserMessage::get_recipient_filter() const
 {
 	return m_recipient_filter;
 }

src/core/modules/usermessage/ob/usermessage_implementation.h

@@ -36,14 +36,14 @@
 class CUserMessage : public CUserMessageImplementation
 {
 public:
-	CUserMessage(const CMRecipientFilter &recipient_filter, const char *message_name);
+	CUserMessage(const MRecipientFilter &recipient_filter, const char *message_name);
 	~CUserMessage();
 
 	virtual void send_message();
 
 	const char *get_message_name() const;
 	const int get_message_index() const;
-	const CMRecipientFilter &get_recipient_filter() const;
+	const MRecipientFilter &get_recipient_filter() const;
 	bool has_been_sent() const;
 
 	// Virtual function call override (calls to base class)