summaryrefslogtreecommitdiffstats
path: root/src/crsm.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/crsm.hpp')
-rw-r--r--src/crsm.hpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/crsm.hpp b/src/crsm.hpp
index d96cc7b..d9740e6 100644
--- a/src/crsm.hpp
+++ b/src/crsm.hpp
@@ -20,11 +20,12 @@
#include "CmdFunctionRef.hpp"
#include "ProcessManager.hpp"
+#include "CRSMConfig.hpp"
#define CONFIG_FILE_NAME "CrServerManager.conf"
#define CUR_SCEN_FILE_NAME "curscen.txt"
#define LAST_SCEN_FILE_NAME "lastscen.txt"
-#define SCOREBOARD_FILE_NAME settings["ClonkDirectory"] + "scoreboard.html"
+#define SCOREBOARD_FILE_NAME Config.Auto.Volatile.Clonk.Directory + "scoreboard.html"
#define IRC_CHECK_CALLBACK(name) void name(const ClientInfo& requester, int status, const ClientInfo& subject)
#define IRC_CHECK_CALLBACK_IMPL(name) void CRSM::name(const ClientInfo& requester, int status, const ClientInfo& subject) { (void)requester; (void)status; (void)subject;
@@ -102,6 +103,8 @@ private slots:
void updateNextAutoScens();
private:
+ CRSMConfig Config;
+
QList<ScenarioSettings> userlist;
QList<ScenarioSettings> autolist;
QList<ScenarioSettings> nextAutoScens;
@@ -117,11 +120,11 @@ private:
QTextStream *qout;
QTextStream *qin;
bool finish;
- QMap<QString, QString> settings;
+ //QMap<QString, QString> settings;
QMap<QString, QString> session;
QMap<QString, ClientInfo> clients;
- QMap<QString, QStringList> lists;
- QMap<QString, QMap<QString, QString>> maps;
+ //QMap<QString, QStringList> lists;
+ //QMap<QString, QMap<QString, QString>> maps;
IrcConnection *connection = 0;
bool autoHost = true;
QSignalMapper greetMapper;