diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-03-12 22:46:32 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-03-12 22:46:32 -0400 |
| commit | 47d9d7884c57c2c14dd363b4ccb0df1dcbb5375e (patch) | |
| tree | 14acad810f6ef199d7fc669fc1abe91972eb7f6a /src/game.h | |
| parent | cc75196b1baca28a142e66c69cd51200649d252a (diff) | |
| download | therapy-47d9d7884c57c2c14dd363b4ccb0df1dcbb5375e.tar.gz therapy-47d9d7884c57c2c14dd363b4ccb0df1dcbb5375e.tar.bz2 therapy-47d9d7884c57c2c14dd363b4ccb0df1dcbb5375e.zip | |
Fixed bug that would prevent player from continuing to move after dying, and also refactored collisions and dying a bit
Diffstat (limited to 'src/game.h')
| -rw-r--r-- | src/game.h | 2 |
1 files changed, 1 insertions, 1 deletions
| 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 { | |||
| 30 | void loadMap(const Map& map); | 30 | void loadMap(const Map& map); |
| 31 | void detectCollision(Entity& collider, std::pair<double, double> old_position); | 31 | void detectCollision(Entity& collider, std::pair<double, double> old_position); |
| 32 | void saveGame(const Map& map, std::pair<double, double> position); | 32 | void saveGame(const Map& map, std::pair<double, double> position); |
| 33 | void loadGame(const Map& curMap); | ||
| 34 | void schedule(int frames, std::function<void ()>&& callback); | 33 | void schedule(int frames, std::function<void ()>&& callback); |
| 34 | void playerDie(Entity& player, const Map& curMap); | ||
| 35 | 35 | ||
| 36 | private: | 36 | private: |
| 37 | friend void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods); | 37 | friend void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods); |