From 6b1dcc5df51df4a2d8b724187eb1bcdb4fd9df8b Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Sat, 14 Mar 2015 19:25:23 -0400
Subject: Added sound when you hit the ground

Also split up components.cpp into files for each class, fixed a bug concerning falling off the screen when you change maps, and converted collision data into doubles.
---
 src/game.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/game.h')

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 {
   public:
     Game();
     void execute(GLFWwindow* window);
-    void loadMap(const Map& map);
+    void loadMap(const Map& map, std::pair<double, double> position);
     void detectCollision(Entity& collider, std::pair<double, double> old_position);
     void saveGame();
     void schedule(double time, std::function<void ()> callback);
@@ -39,6 +39,7 @@ class Game {
 
     std::list<std::shared_ptr<Entity>> entities;
     std::list<std::shared_ptr<Entity>> nextEntities;
+    std::pair<double, double> nextPosition;
     bool newWorld;
     std::shared_ptr<Entity> player;
     const Map* currentMap;
-- 
cgit 1.4.1