Move clonk control specific parts into ClonkControl

There are still many clonk commands hardcoded through the
pass-CRSM-Commands

1 files changed, 5 insertions, 3 deletions

diff --git a/src/crsm.hpp b/src/crsm.hpp
index 87886c6..abae69a 100644
--- a/src/crsm.hpp
+++ b/src/crsm.hpp
@@ -29,6 +29,7 @@
 
 #include "ClonkInterface.hpp"
 #include "PatchedClonkParser.hpp"
+#include "PatchedClonkControl.hpp"
 
 #define CONFIG_FILE_NAME "CrServerManager.conf"
 #define SESSION_FILE_NAME "CrServerManager.session"
@@ -76,7 +77,7 @@ public:
     QString value() { return Util::joinEscape({ConfigValueBase::getStringValue(config.name), ConfigValueBase::getStringValue(config.league), ConfigValueBase::getStringValue(config.wishClient)}, ':', '|'); }
 };
 
-class CRSM : public QObject, public ClonkOutputInterface
+class CRSM : public QObject, public ClonkOutputInterface, public ClonkControllerInterface
 {
     friend CRSMSession::CRSMSession(CRSM *crsm);
 private:
@@ -158,6 +159,7 @@ private:
     CRSMLogging Log;
 
     PatchedClonkParser parser;
+    PatchedClonkControl control;
 
     QList<ScenarioSettings> userlist;
     QList<ScenarioSettings> autolist;
@@ -246,11 +248,11 @@ private:
     void out(const QString& text);
     void replayOutputBuffer(QTcpSocket *socket, bool clear = true);
 
-    void announceInfo(const QString& info);
+    void announceInfo(const QString& info, bool useOutgameChannel = true);
 
     bool scenAllowed(const ScenarioSettings& scen, const ClientInfo& client, UserType userType);
 
-    void kick(const QString& pcName, const QString& reason = "");
+    void kick(const ClientInfo& client, const QString& reason = "");
 
     void prepareAndConnectIrc();