From 6cd202153bb61e14f9968845c43ca966ceab1e05 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Sat, 14 Mar 2015 16:21:50 -0400
Subject: Removed explicit map loading from Game since maps load each other now

---
 src/game.cpp | 5 +++--
 src/game.h   | 2 --
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/game.cpp b/src/game.cpp
index 7ec4460..1ff3f4f 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -19,9 +19,10 @@ Game::Game()
   auto player_anim = std::make_shared<PlayerSpriteComponent>();
   player->addComponent(player_anim);
   
-  save = {&m, player->position};
+  Map& startingMap = Map::getNamedMap("embarass");
+  save = {&startingMap, player->position};
   
-  loadMap(m);
+  loadMap(startingMap);
 }
 
 void key_callback(GLFWwindow* window, int key, int, int action, int)
diff --git a/src/game.h b/src/game.h
index 33d1965..ab8b906 100644
--- a/src/game.h
+++ b/src/game.h
@@ -40,8 +40,6 @@ class Game {
     std::list<std::shared_ptr<Entity>> nextEntities;
     bool newWorld;
     std::shared_ptr<Entity> player;
-    Map m {Map::getNamedMap("embarass")};
-    Map m2 {Map::getNamedMap("second")};
     Savefile save;
     std::list<std::pair<double, std::function<void ()>>> scheduled;
     bool shouldQuit = false;
-- 
cgit 1.4.1