From 47d9d7884c57c2c14dd363b4ccb0df1dcbb5375e Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Thu, 12 Mar 2015 22:46:32 -0400 Subject: Fixed bug that would prevent player from continuing to move after dying, and also refactored collisions and dying a bit --- src/game.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/game.h') diff --git a/src/game.h b/src/game.h index ca6c00b..4f2f3df 100644 --- a/src/game.h +++ b/src/game.h @@ -30,8 +30,8 @@ class Game { void loadMap(const Map& map); void detectCollision(Entity& collider, std::pair old_position); void saveGame(const Map& map, std::pair position); - void loadGame(const Map& curMap); void schedule(int frames, std::function&& callback); + void playerDie(Entity& player, const Map& curMap); private: friend void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods); -- cgit 1.4.1