summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/crsm.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/crsm.cpp b/src/crsm.cpp
index 3fe1000..08edc4a 100644
--- a/src/crsm.cpp
+++ b/src/crsm.cpp
@@ -149,13 +149,13 @@ void CRSM::readServerOutput()
if(pcName != Config.Auto.Volatile.Clonk.ServerPCName)
{
ClientInfo& info = getClientInfo(pcName, cuid, user);
+ QString msg = userexp.cap(5).trimmed();
if(info.floodCheck(Config.Clonk.Chat.AntiFlood.Count, Config.Clonk.Chat.AntiFlood.Time, QDateTime(QDate::currentDate(), QTime::fromString(timeRemover.cap(1), "hh:mm:ss"))))
{
kick(pcName, "Flooding! Maximal " + QString::number(Config.Clonk.Chat.AntiFlood.Count) + " Nachrichten in " + QString::number(Config.Clonk.Chat.AntiFlood.Time) + "s");
}
else if(!isMeMessage)
{
- QString msg = userexp.cap(5).trimmed();
if(msg.length() > Config.CRSM.CommandSign.length() && msg.left(Config.CRSM.CommandSign.length()) == Config.CRSM.CommandSign)
{
QString command = msg.mid(Config.CRSM.CommandSign.length());
@@ -170,6 +170,10 @@ void CRSM::readServerOutput()
connection->sendCommand(IrcCommand::createMessage(Config.IRC.IngameChannel, "[Clonk]<" + user + "> " + msg));
}
}
+ else if(Session.IRC.UseIngameChat)
+ {
+ connection->sendCommand(IrcCommand::createCtcpAction(Config.IRC.IngameChannel, "[Clonk] " + user + " " + msg));
+ }
}
}
static QRegExp joinExp("^Client (.+) (?:verbunden|connected)\\.\\s*$");