Add Map and MapLoad

src/state/maingame.cpp

@@ -5,13 +5,19 @@ void UpdateCollisions(Entity* entityA, Entity* entityB) {
 }
 
 void MainGame::Initialize(sf::RenderWindow* window) {
-    entityManager = new EntityManager();
-    entityManager->SetCollisionMethod(UpdateCollisions);
+    this->entityManager = new EntityManager();
+    this->entityManager->SetCollisionMethod(UpdateCollisions);
 
+    // Add entities
     this->entityManager->AddEntity("test", new Entity("data\\gfx\\test.png"));
     this->entityManager->AddEntity("test", new Entity("data\\gfx\\test.png"));
     this->entityManager->Get("test0")->velocity.x = 0.5;
     this->entityManager->Get("test")->setPosition(sf::Vector2f(50, 50));
+
+    // Load map
+    this->map = new Map();
+    MapLoad mapLoad;
+    mapLoad.Load(this->map, "data\\map\\level1.json");
 }
 
 void MainGame::Update(sf::RenderWindow* window) {

src/state/maingame.h

@@ -6,6 +6,7 @@
 #include "gamestate.h"
 #include "entitymanager.h"
 #include "inputmanager.h"
+#include "mapload.h"
 
 class MainGame : public GameState
 {
@@ -17,6 +18,7 @@ public:
 
 private:
     EntityManager* entityManager;
+    Map* map;
 };
 
 #endif // MAINGAME_H