diff options
| author | Markus Mittendrein <git@maxmitti.tk> | 2015-09-24 18:14:55 +0200 |
|---|---|---|
| committer | Markus Mittendrein <git@maxmitti.tk> | 2015-09-24 18:14:55 +0200 |
| commit | 652bd911aad295ac789df5e512fffb4ccaaff894 (patch) | |
| tree | 112a4b3798cc0621796e6f8dc3bc3c9ee67a16e2 | |
| parent | dddd1bbf1e8c345a847b226525444abe8743b989 (diff) | |
| download | manager-652bd911aad295ac789df5e512fffb4ccaaff894.tar.gz manager-652bd911aad295ac789df5e512fffb4ccaaff894.zip | |
Rename Session.IrcUseIngameChat to Session.IRC.UseIngameChat and only
forward irc messages to ingame chat if Session.IRC.UseIngameChat == true
| -rw-r--r-- | src/crsm.cpp | 16 | ||||
| -rw-r--r-- | src/crsm.hpp | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/crsm.cpp b/src/crsm.cpp index bcead5a..e53b201 100644 --- a/src/crsm.cpp +++ b/src/crsm.cpp @@ -169,7 +169,7 @@ void CRSM::readServerOutput() } } - else if(Session.IrcUseIngameChat) + else if(Session.IRC.UseIngameChat) { connection->sendCommand(IrcCommand::createMessage(Config.IRC.IngameChannel, "[Clonk]<" + user + "> " + msg)); } @@ -189,7 +189,7 @@ void CRSM::readServerOutput() connect(timer, SIGNAL(timeout()), timer, SLOT(deleteLater())); greetMapper.setMapping(timer, info.pcName); timer->start(1000); - if(Session.IrcUseIngameChat) + if(Session.IRC.UseIngameChat) { connection->sendCommand(IrcCommand::createMessage(Config.IRC.IngameChannel, "[Clonk] " + info.toString() + " verbunden.")); } @@ -246,7 +246,7 @@ void CRSM::readServerOutput() ClientInfo &info = getClientInfo(infoMatch.cap(1), infoMatch.cap(2).toInt(), infoMatch.cap(3)); writeToServer(QString(info.nick +" ist ein L34V0R!\n")); - if(Session.IrcUseIngameChat) + if(Session.IRC.UseIngameChat) { connection->sendCommand(IrcCommand::createMessage(Config.IRC.IngameChannel, "[Clonk] " + info.toString() + " entfernt" + leaveExp.cap(2))); } @@ -447,7 +447,7 @@ void CRSM::ircMessageReceived(IrcMessage *message) if(message->parameters().at(0) == connection->nickName()) target = message->nick(); QString mess = message->parameters().at(1).trimmed(); - if(target == Config.IRC.IngameChannel) + if(target == Config.IRC.IngameChannel && Session.IRC.UseIngameChat) { writeToServer("[IRC]<" + message->nick() + "> " + mess + "\n"); } @@ -666,7 +666,7 @@ void CRSM::startScen(const ScenarioSettings &scen, QStringList argList) scoreboardFile.close(); Session.ScenarioName = scen.name; - Session.IrcUseIngameChat = Config.IRC.UseIngameChat; + Session.IRC.UseIngameChat = Config.IRC.UseIngameChat; Session.State = CRSMSession::Lobby; ircSetIngameChannelTopic(); filename = scen.name; @@ -1151,9 +1151,9 @@ QString CRSM::ircActivateIngameChat(bool activated) { if(Config.IRC.UseIngameChat && !Config.IRC.IngameChannel.isEmpty()) { - Session.IrcUseIngameChat = activated; + Session.IRC.UseIngameChat = activated; ircSetIngameChannelTopic(); - return "Ingamechat wurde " + (Session.IrcUseIngameChat ? QString("") : QString("de")) + "aktviert."; + return "Ingamechat wurde " + (Session.IRC.UseIngameChat ? QString("") : QString("de")) + "aktviert."; } else return "Ingamechat ist administrativ deaktiviert!"; @@ -1234,7 +1234,7 @@ void CRSM::ircSetIngameChannelTopic() default: break; } - connection->sendCommand(IrcCommand::createTopic(Config.IRC.IngameChannel, "Aktuelles Szenario: " + Session.ScenarioName + " | " + statusText + " | Ingamechat ist " + (Session.IrcUseIngameChat ? "" : "de") + "aktviert.")); + connection->sendCommand(IrcCommand::createTopic(Config.IRC.IngameChannel, "Aktuelles Szenario: " + Session.ScenarioName + " | " + statusText + " | Ingamechat ist " + (Session.IRC.UseIngameChat ? "" : "de") + "aktviert.")); } } } diff --git a/src/crsm.hpp b/src/crsm.hpp index d8f6d0d..c1d655d 100644 --- a/src/crsm.hpp +++ b/src/crsm.hpp @@ -107,7 +107,6 @@ private: struct CRSMSession { - bool IrcUseIngameChat = false; bool League = false; enum {None = -1, Lobby = 0, Loading = 1, Running = 2} State = None; bool UserWish = false; @@ -123,6 +122,7 @@ private: struct { ClientInfo Admin; + bool UseIngameChat = false; } IRC; void clear() |