summaryrefslogtreecommitdiffstats
path: root/src/server/util
diff options
context:
space:
mode:
authorChristian Klinger2016-05-20 11:59:43 +0200
committerChristian Klinger2016-05-20 11:59:43 +0200
commit39938efd6c437391ddfaadfb9c4dbe4f08c54556 (patch)
tree82f7357a858d9269bf4b8b83c5e259f3b8fb24d2 /src/server/util
parentadded --manager-only (and removed the ipList-feature) (diff)
downloadpvs2-39938efd6c437391ddfaadfb9c4dbe4f08c54556.tar.gz
pvs2-39938efd6c437391ddfaadfb9c4dbe4f08c54556.tar.xz
pvs2-39938efd6c437391ddfaadfb9c4dbe4f08c54556.zip
added feature tutorIP.
Diffstat (limited to 'src/server/util')
-rw-r--r--src/server/util/global.cpp5
-rw-r--r--src/server/util/global.h6
2 files changed, 5 insertions, 6 deletions
diff --git a/src/server/util/global.cpp b/src/server/util/global.cpp
index 41f6389..39e72fb 100644
--- a/src/server/util/global.cpp
+++ b/src/server/util/global.cpp
@@ -38,15 +38,12 @@ void Global::setCurrentRoom(QString room)
const Room* Global::getCurrentRoom() {
if (_rooms.contains(_currentRoom)) {
- qDebug() << "returning actual room: " << _currentRoom;
return _rooms[_currentRoom];
} else {
- qDebug() << "couldn't find the room name " << _currentRoom << " in the _rooms-Map";
static Room* defaultRoom = NULL;
if (defaultRoom == NULL) {
- defaultRoom = new Room(QMap<QString, QPoint>(), QSize(8, 6), QSize(1,1), "");
+ defaultRoom = new Room(QMap<QString, QPoint>(), QSize(8, 6), QSize(1,1), "", "");
}
- qDebug() << "returned default room";
return defaultRoom;
}
}
diff --git a/src/server/util/global.h b/src/server/util/global.h
index 59bed27..4a71348 100644
--- a/src/server/util/global.h
+++ b/src/server/util/global.h
@@ -17,15 +17,17 @@
#include <QList>
struct Room {
- Room(QMap<QString, QPoint> cPos, QSize grid, QSize client, QString image) :
+ Room(QMap<QString, QPoint> cPos, QSize grid, QSize client, QString image, QString tutor) :
clientPositions(cPos),
gridSize(grid),
clientSize(client),
- imagePath(image) {};
+ imagePath(image),
+ tutorIP(tutor){};
QMap<QString, QPoint> clientPositions;
QSize gridSize;
QSize clientSize;
QString imagePath;
+ QString tutorIP;
};
class Global {