summaryrefslogtreecommitdiffstats
path: root/src/server/util/global.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/util/global.h')
-rw-r--r--src/server/util/global.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/server/util/global.h b/src/server/util/global.h
index c258b4a..f9dc327 100644
--- a/src/server/util/global.h
+++ b/src/server/util/global.h
@@ -28,8 +28,7 @@ struct Room {
QString imagePath;
};
-class Global
-{
+class Global {
private:
Global(){}
~Global(){}
@@ -51,7 +50,11 @@ public:
}
static void setCurrentRoom(QString room);
- static const QString& getCurrentRoom() { return _currentRoom; }
+ static const QString& getCurrentRoomName() { return _currentRoom; }
+
+ /* returns a pointer to the current room or a pointer to the constant "defaultRoom".
+ * (NEVER returns NULL or undefined) */
+ static const Room* getCurrentRoom();
};
#endif /* GLOBAL_H_ */