From 0e0389752a0912614737e5c059b5cd4719ef9cf2 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Tue, 10 Mar 2015 19:42:04 -0400 Subject: Const correctness! Also created savefile and refactored collisions a bit. --- src/game.cpp | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'src/game.cpp') diff --git a/src/game.cpp b/src/game.cpp index cbbae06..e392923 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -20,6 +20,8 @@ Game::Game() auto player_anim = std::make_shared(); player->addComponent(player_anim); + save = {&m, player->position}; + loadMap(m); } @@ -87,7 +89,7 @@ void Game::execute(GLFWwindow* window) } } -void Game::loadMap(Map& map) +void Game::loadMap(const Map& map) { auto mapEn = std::make_shared(); @@ -111,3 +113,18 @@ void Game::detectCollision(Entity& collider, std::pair old_posit entity->detectCollision(*this, collider, old_position); } } + +void Game::saveGame(const Map& map, std::pair position) +{ + save = {&map, position}; +} + +void Game::loadGame(const Map& curMap) +{ + if (&curMap != save.map) + { + loadMap(*(save.map)); + } + + player->position = save.position; +} -- cgit 1.4.1