diff options
Diffstat (limited to 'src/game.h')
| -rw-r--r-- | src/game.h | 3 |
1 files changed, 2 insertions, 1 deletions
| diff --git a/src/game.h b/src/game.h index bc31912..a4620d4 100644 --- a/src/game.h +++ b/src/game.h | |||
| @@ -28,7 +28,7 @@ class Game { | |||
| 28 | public: | 28 | public: |
| 29 | Game(); | 29 | Game(); |
| 30 | void execute(GLFWwindow* window); | 30 | void execute(GLFWwindow* window); |
| 31 | void loadMap(const Map& map); | 31 | void loadMap(const Map& map, std::pair<double, double> position); |
| 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(); | 33 | void saveGame(); |
| 34 | void schedule(double time, std::function<void ()> callback); | 34 | void schedule(double time, std::function<void ()> callback); |
| @@ -39,6 +39,7 @@ class Game { | |||
| 39 | 39 | ||
| 40 | std::list<std::shared_ptr<Entity>> entities; | 40 | std::list<std::shared_ptr<Entity>> entities; |
| 41 | std::list<std::shared_ptr<Entity>> nextEntities; | 41 | std::list<std::shared_ptr<Entity>> nextEntities; |
| 42 | std::pair<double, double> nextPosition; | ||
| 42 | bool newWorld; | 43 | bool newWorld; |
| 43 | std::shared_ptr<Entity> player; | 44 | std::shared_ptr<Entity> player; |
| 44 | const Map* currentMap; | 45 | const Map* currentMap; |
