From de8cae01617b57ebd36a7d3fab3b4875b0da2255 Mon Sep 17 00:00:00 2001
From: Björn Hagemeister
Date: Thu, 4 Sep 2014 18:10:57 +0200
Subject: The sessionID is ignored by manager if client is connecting via
 auto-connect.

---
 src/server/util/global.cpp | 13 +++++++++++++
 src/server/util/global.h   | 14 ++++++++++++++
 2 files changed, 27 insertions(+)

(limited to 'src/server/util')

diff --git a/src/server/util/global.cpp b/src/server/util/global.cpp
index 7bb3cc0..3ddbd65 100644
--- a/src/server/util/global.cpp
+++ b/src/server/util/global.cpp
@@ -9,6 +9,9 @@
 
 QString Global::_sessionName = QString();
 QByteArray Global::_sessionNameArray = QByteArray();
+QMap<QString, QMap<QString, QPoint> > Global::_rooms =
+		QMap<QString, QMap<QString, QPoint> >();
+QString Global::_currentRoom = QString();
 
 void Global::setSessionName(const QString& name)
 {
@@ -22,3 +25,13 @@ void Global::setSessionName()
 	Global::_sessionName = name;
 	Global::_sessionNameArray = name.toUtf8();
 }
+
+void Global::setRooms(const QMap<QString, QMap<QString, QPoint> >& roomList)
+{
+	Global::_rooms = roomList;
+}
+
+void Global::setCurrentRoom(QString room)
+{
+	Global::_currentRoom = room;
+}
diff --git a/src/server/util/global.h b/src/server/util/global.h
index c5e0728..d4fed6c 100644
--- a/src/server/util/global.h
+++ b/src/server/util/global.h
@@ -10,6 +10,10 @@
 
 #include <QString>
 #include <QByteArray>
+#include <QMap>
+#include <QPair>
+#include <QPoint>
+#include <QList>
 
 class Global
 {
@@ -19,12 +23,22 @@ private:
 
 	static QString _sessionName;
 	static QByteArray _sessionNameArray;
+	static QMap<QString, QMap<QString, QPoint> > _rooms;
+	static QString _currentRoom;
 
 public:
 	static const QString& sessionName() { return Global::_sessionName; }
 	static const QByteArray& sessionNameArray() { return Global::_sessionNameArray; }
 	static void setSessionName(const QString& name);
 	static void setSessionName();
+
+	static void setRooms(const QMap<QString, QMap<QString, QPoint> > & roomList);
+	static const QMap<QString, QMap<QString, QPoint> >& getRooms() {
+		return _rooms;
+	}
+
+	static void setCurrentRoom(QString room);
+	static const QString& getCurrentRoom() { return _currentRoom; }
 };
 
 #endif /* GLOBAL_H_ */
-- 
cgit v1.2.3-55-g7522