Closes bug #2807. (And also cleans the code (a bit))

1 files changed, 16 insertions, 0 deletions

diff --git a/src/server/util/global.cpp b/src/server/util/global.cpp
index 3021ca9..8bb89d0 100644
--- a/src/server/util/global.cpp
+++ b/src/server/util/global.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "global.h"
+#include <QDebug>
 
 QString Global::_sessionName = QString();
 QByteArray Global::_sessionNameArray = QByteArray();
@@ -34,3 +35,18 @@ void Global::setCurrentRoom(QString room)
 {
 	Global::_currentRoom = 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), "");
+        }
+        qDebug() << "returned default room";
+        return defaultRoom;
+    }
+}