Cleaned up some things, made the protocol modules use some basic inheritance to cut back on their code duplication. More work can be done in the future to remove even more of it.

5 files changed, 5 insertions, 5 deletions

diff --git a/modules/extra/cs_entrymsg.cpp b/modules/extra/cs_entrymsg.cpp
index aae1b5f0e..e44d21827 100644
--- a/modules/extra/cs_entrymsg.cpp
+++ b/modules/extra/cs_entrymsg.cpp
@@ -174,7 +174,7 @@ class CSEntryMessage : public Module
 
 			if (c->ci->GetExtRegular("cs_entrymsg", messages))
 				for (unsigned i = 0; i < messages.size(); ++i)
-					u->SendMessage(whosends(c->ci)->nick, "[%s] %s", c->ci->name.c_str(), messages[i].message.c_str());
+					u->SendMessage(whosends(c->ci), "[%s] %s", c->ci->name.c_str(), messages[i].message.c_str());
 		}
 	}
 		
diff --git a/modules/extra/cs_set_misc.cpp b/modules/extra/cs_set_misc.cpp
index 9f4ade29c..2e5fa5965 100644
--- a/modules/extra/cs_set_misc.cpp
+++ b/modules/extra/cs_set_misc.cpp
@@ -173,7 +173,7 @@ class CSSetMisc : public Module
 
 			Anope::string value;
 			if (ci->GetExtRegular("chanserv:" + it->first, value))
-				u->SendMessage(Config->s_ChanServ, "      %s: %s", it->first.c_str(), value.c_str());
+				u->SendMessage(ChanServ, "      %s: %s", it->first.c_str(), value.c_str());
 		}
 	}
 
diff --git a/modules/extra/m_alias.cpp b/modules/extra/m_alias.cpp
index de23557a3..3b9556772 100644
--- a/modules/extra/m_alias.cpp
+++ b/modules/extra/m_alias.cpp
@@ -66,7 +66,7 @@ class ModuleAlias : public Module
 
 			if (fantasy != alias.fantasy)
 				return EVENT_CONTINUE;
-			else if (!is_oper(u) && alias.operonly)
+			else if (!u->HasMode(UMODE_OPER) && alias.operonly)
 				return EVENT_CONTINUE;
 			else if (!fantasy && !bi->nick.equals_ci(alias.client))
 				return EVENT_CONTINUE;
diff --git a/modules/extra/m_xmlrpc_main.cpp b/modules/extra/m_xmlrpc_main.cpp
index 74b570ee2..59088792f 100644
--- a/modules/extra/m_xmlrpc_main.cpp
+++ b/modules/extra/m_xmlrpc_main.cpp
@@ -13,7 +13,7 @@ class XMLRPCUser : public User
 		this->server = Me;
 	}
 
-	void SendMessage(const Anope::string &source, const Anope::string &msg)
+	void SendMessage(BotInfo *, const Anope::string &msg)
 	{
 		this->out += msg + "\n";
 	}
diff --git a/modules/extra/ns_set_misc.cpp b/modules/extra/ns_set_misc.cpp
index 65dfadc2d..b38c98ae7 100644
--- a/modules/extra/ns_set_misc.cpp
+++ b/modules/extra/ns_set_misc.cpp
@@ -176,7 +176,7 @@ class NSSetMisc : public Module
 
 			Anope::string value;
 			if (na->nc->GetExtRegular("nickserv:" + it->first, value))
-				u->SendMessage(Config->s_NickServ, "      %s: %s", it->first.c_str(), value.c_str());
+				u->SendMessage(NickServ, "      %s: %s", it->first.c_str(), value.c_str());
 		}
 	}