From f193e6f2e2385a9e240db18d2fda07aae42e1d2a Mon Sep 17 00:00:00 2001
From: Christian Klinger
Date: Wed, 27 Apr 2016 12:24:37 +0200
Subject: refactor to use Room struct

to save additional properties like gridSize and clientSize.
---
 src/server/util/global.cpp |  5 ++---
 src/server/util/global.h   | 14 +++++++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'src/server/util')

diff --git a/src/server/util/global.cpp b/src/server/util/global.cpp
index 9a4c7c6..3021ca9 100644
--- a/src/server/util/global.cpp
+++ b/src/server/util/global.cpp
@@ -9,8 +9,7 @@
 
 QString Global::_sessionName = QString();
 QByteArray Global::_sessionNameArray = QByteArray();
-QMap<QString, QMap<QString, QPoint> > Global::_rooms =
-		QMap<QString, QMap<QString, QPoint> >();
+QMap<QString, Room*> Global::_rooms = QMap<QString, Room*>();
 QString Global::_currentRoom = QString();
 
 void Global::setSessionName(const QString& name)
@@ -26,7 +25,7 @@ void Global::setSessionName()
 	Global::_sessionNameArray = name.toUtf8();
 }
 
-void Global::setRooms(const QMap<QString, QMap<QString, QPoint> >& roomList)
+void Global::setRooms(const QMap<QString, Room*>& roomList)
 {
 	Global::_rooms = roomList;
 }
diff --git a/src/server/util/global.h b/src/server/util/global.h
index d4fed6c..a911fa3 100644
--- a/src/server/util/global.h
+++ b/src/server/util/global.h
@@ -13,8 +13,16 @@
 #include <QMap>
 #include <QPair>
 #include <QPoint>
+#include <QSize>
 #include <QList>
 
+struct Room {
+    Room(QMap<QString, QPoint> cPos, QSize grid, QSize client) : clientPositions(cPos), gridSize(grid), clientSize(client) {};
+    QMap<QString, QPoint> clientPositions;
+    QSize gridSize;
+    QSize clientSize;
+};
+
 class Global
 {
 private:
@@ -23,7 +31,7 @@ private:
 
 	static QString _sessionName;
 	static QByteArray _sessionNameArray;
-	static QMap<QString, QMap<QString, QPoint> > _rooms;
+	static QMap<QString, Room*> _rooms;
 	static QString _currentRoom;
 
 public:
@@ -32,8 +40,8 @@ public:
 	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() {
+	static void setRooms(const QMap<QString, Room*> & roomList);
+	static const QMap<QString, Room*> & getRooms() {
 		return _rooms;
 	}
 
-- 
cgit v1.2.3-55-g7522