diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-03-14 17:58:50 -0400 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2015-03-14 17:58:50 -0400 |
commit | d9349f10d6d1972e87aea76d502703fae128a0e5 (patch) | |
tree | 93d545f8da6865ed81329426a510c81e7c3d44fd /src/game.h | |
parent | 2ca593c5f09ee59a39733856cdb1f7191dc87216 (diff) | |
download | therapy-d9349f10d6d1972e87aea76d502703fae128a0e5.tar.gz therapy-d9349f10d6d1972e87aea76d502703fae128a0e5.tar.bz2 therapy-d9349f10d6d1972e87aea76d502703fae128a0e5.zip |
Removed some unnecessary parameters from methods
Diffstat (limited to 'src/game.h')
-rw-r--r-- | src/game.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/game.h b/src/game.h index 065aca8..bc31912 100644 --- a/src/game.h +++ b/src/game.h | |||
@@ -30,9 +30,9 @@ class Game { | |||
30 | void execute(GLFWwindow* window); | 30 | void execute(GLFWwindow* window); |
31 | void loadMap(const Map& map); | 31 | void loadMap(const Map& map); |
32 | void detectCollision(Entity& collider, std::pair<double, double> old_position); | 32 | void detectCollision(Entity& collider, std::pair<double, double> old_position); |
33 | void saveGame(const Map& map, std::pair<double, double> position); | 33 | void saveGame(); |
34 | void schedule(double time, std::function<void ()> callback); | 34 | void schedule(double time, std::function<void ()> callback); |
35 | void playerDie(Entity& player, const Map& curMap); | 35 | void playerDie(); |
36 | 36 | ||
37 | private: | 37 | private: |
38 | friend void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods); | 38 | friend void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods); |
@@ -41,6 +41,7 @@ class Game { | |||
41 | std::list<std::shared_ptr<Entity>> nextEntities; | 41 | std::list<std::shared_ptr<Entity>> nextEntities; |
42 | bool newWorld; | 42 | bool newWorld; |
43 | std::shared_ptr<Entity> player; | 43 | std::shared_ptr<Entity> player; |
44 | const Map* currentMap; | ||
44 | Savefile save; | 45 | Savefile save; |
45 | std::list<std::pair<double, std::function<void ()>>> scheduled; | 46 | std::list<std::pair<double, std::function<void ()>>> scheduled; |
46 | bool shouldQuit = false; | 47 | bool shouldQuit = false; |