From 2267a328b237099fa9551c61bd3f14594cb9af63 Mon Sep 17 00:00:00 2001
From: Markus Mittendrein <git@maxmitti.tk>
Date: Sun, 21 Aug 2016 14:35:05 +0200
Subject: Add config option for extra topic

---
 src/CRSMConfig.hpp | 2 ++
 src/crsm.cpp       | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/CRSMConfig.hpp b/src/CRSMConfig.hpp
index 5ecb158..3185b6d 100644
--- a/src/CRSMConfig.hpp
+++ b/src/CRSMConfig.hpp
@@ -69,6 +69,7 @@ public:
         String Channel = "#crsm";
         Boolean UseIngameChat = false;
         String IngameChannel = "#crsm-ingame";
+        String IngameChannelExtraTopic = "";
         String QuitMessage = "Dedicated Clonk server powered by CRSM";
         Integer ReconnectDelay = 10;
         String ScenListMessage = "A list of available scenarios is available over DCC, ingame or in a lobby.";
@@ -161,6 +162,7 @@ public:
         ConfigVal(IRC.Channel),
         ConfigVal(IRC.UseIngameChat),
         ConfigVal(IRC.IngameChannel),
+        ConfigVal(IRC.IngameChannelExtraTopic),
         ConfigVal(IRC.QuitMessage),
         ConfigVal(IRC.ReconnectDelay),
         ConfigVal(IRC.ScenListMessage),
diff --git a/src/crsm.cpp b/src/crsm.cpp
index 3fc66aa..17d4dee 100644
--- a/src/crsm.cpp
+++ b/src/crsm.cpp
@@ -1257,7 +1257,7 @@ void CRSM::ircSetIngameChannelTopic()
     {
         if(Session.State == CRSMSession::None)
         {
-            connection->sendCommand(IrcCommand::createTopic(Config.IRC.IngameChannel, "Kein laufendes Spiel."));
+            connection->sendCommand(IrcCommand::createTopic(Config.IRC.IngameChannel, Config.IRC.IngameChannelExtraTopic + "Kein laufendes Spiel."));
         }
         else
         {
@@ -1276,7 +1276,7 @@ void CRSM::ircSetIngameChannelTopic()
                 case CRSMSession::None: // is handled above
                     break;
             }
-            connection->sendCommand(IrcCommand::createTopic(Config.IRC.IngameChannel, "Aktuelles Szenario: " + Session.Scenario.name + " | " + statusText + " | Ingamechat ist " + (Session.IRC.UseIngameChat ? "" : "de") + "aktiviert."));
+            connection->sendCommand(IrcCommand::createTopic(Config.IRC.IngameChannel, Config.IRC.IngameChannelExtraTopic + "Aktuelles Szenario: " + Session.Scenario.name + " | " + statusText + " | Ingamechat ist " + (Session.IRC.UseIngameChat ? "" : "de") + "aktiviert."));
         }
     }
 }
-- 
cgit v1.2.3-54-g00ecf