Fixed default map definition for a new created character, enabled loading of map when a character is on it, fixed inconsistency in getter/setter for map id.

1 files changed, 9 insertions, 5 deletions

diff --git a/src/state.cpp b/src/state.cpp
index 1fbbb189..d49bf407 100644
--- a/src/state.cpp
+++ b/src/state.cpp
@@ -22,10 +22,13 @@
  */
 
 #include "state.h"
+
 #include <iostream>
+
+#include "mapmanager.h"
 #include "messageout.h"
+
 #include "utils/logger.h"
-#include "mapreader.h"
 
 namespace tmwserv
 {
@@ -131,10 +134,11 @@ bool State::beingExists(BeingPtr beingPtr) {
 }
 
 bool State::loadMap(const unsigned int mapId) {
-    // load map (FAILS)
-    Map *tmp = NULL; //MapReader::readMap("maps/" + map);
-    //if (!tmp)
-    //    return false;
+    Map *tmp = MapManager::instance().loadMap(mapId);
+    if (!tmp)
+    {
+        return false;
+    }
 
     maps[mapId] = MapComposite();
     maps[mapId].map = tmp;