X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_delaymsg.cpp;h=f13ea48ead7e9acba3ebae251b09ecaa4e8b3e74;hb=a032cd90ad5582914759e226085efee5aae1a1ef;hp=247630e65e4a6e2d19186ace07144ad19ea155f9;hpb=565544fac966b14e046bb3042ab485f79bcf7c9e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp
index 247630e65..f13ea48ea 100644
--- a/src/modules/m_delaymsg.cpp
+++ b/src/modules/m_delaymsg.cpp
@@ -36,9 +36,9 @@ class DelayMsgMode : public ParamMode<DelayMsgMode, LocalIntExt>
 	}
 
 	ModeAction OnSet(User* source, Channel* chan, std::string& parameter) CXX11_OVERRIDE;
-	void OnUnset(User* source, Channel* chan);
+	void OnUnset(User* source, Channel* chan) CXX11_OVERRIDE;
 
-	void SerializeParam(Channel* chan, int n, std::string& out)
+	void SerializeParam(Channel* chan, intptr_t n, std::string& out)
 	{
 		out += ConvToStr(n);
 	}
@@ -55,15 +55,15 @@ class ModuleDelayMsg : public Module
 
 	Version GetVersion() CXX11_OVERRIDE;
 	void OnUserJoin(Membership* memb, bool sync, bool created, CUList&) CXX11_OVERRIDE;
-	ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE;
+	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE;
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE;
 };
 
 ModeAction DelayMsgMode::OnSet(User* source, Channel* chan, std::string& parameter)
 {
 	// Setting a new limit, sanity check
-	unsigned int limit = ConvToInt(parameter);
-	if (limit == 0)
+	intptr_t limit = ConvToNum<intptr_t>(parameter);
+	if (limit <= 0)
 		limit = 1;
 
 	ext.set(chan, limit);
@@ -93,15 +93,15 @@ void ModuleDelayMsg::OnUserJoin(Membership* memb, bool sync, bool created, CULis
 	}
 }
 
-ModResult ModuleDelayMsg::OnUserPreMessage(User* user, void* dest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype)
+ModResult ModuleDelayMsg::OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details)
 {
 	if (!IS_LOCAL(user))
 		return MOD_RES_PASSTHRU;
 
-	if ((target_type != TYPE_CHANNEL) || ((!allownotice) && (msgtype == MSG_NOTICE)))
+	if ((target.type != MessageTarget::TYPE_CHANNEL) || ((!allownotice) && (details.type == MSG_NOTICE)))
 		return MOD_RES_PASSTHRU;
 
-	Channel* channel = (Channel*) dest;
+	Channel* channel = target.Get<Channel>();
 	Membership* memb = channel->GetUser(user);
 
 	if (!memb)