diff options
| author | Björn Hagemeister | 2014-09-04 18:10:57 +0200 |
|---|---|---|
| committer | Björn Hagemeister | 2014-09-04 18:10:57 +0200 |
| commit | de8cae01617b57ebd36a7d3fab3b4875b0da2255 (patch) | |
| tree | 27a2fbc5db83225fc552000f7ddb5c778c55e920 /src/server/util | |
| parent | Merge branch 'master' of git.openslx.org:pvs2 (diff) | |
| download | pvs2-de8cae01617b57ebd36a7d3fab3b4875b0da2255.tar.gz pvs2-de8cae01617b57ebd36a7d3fab3b4875b0da2255.tar.xz pvs2-de8cae01617b57ebd36a7d3fab3b4875b0da2255.zip | |
The sessionID is ignored by manager if client is connecting via auto-connect.
Diffstat (limited to 'src/server/util')
| -rw-r--r-- | src/server/util/global.cpp | 13 | ||||
| -rw-r--r-- | src/server/util/global.h | 14 |
2 files changed, 27 insertions, 0 deletions
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_ */ |