1 files changed, 15 insertions, 36 deletions

@@ -1,45 +1,24 @@
-#ifndef GAME_H
-#define GAME_H
+#ifndef GAME_H_1014DDC9
+#define GAME_H_1014DDC9
 
-#include <memory>
-#include <functional>
-#include <list>
-#include <map>
-#include "map.h"
-#include "world.h"
-
-class Entity;
-struct GLFWwindow;
-
-struct Savefile {
-  const Map* map;
-  std::pair<double, double> position;
-};
+#include "renderer.h"
+#include "entity_manager.h"
+#include "system_manager.h"
 
 class Game {
   public:
-    Game(const char* maps);
-    void execute(GLFWwindow* window);
-    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);
-    void playerDie();
-    const World& getWorld() const;
+    Game(GLFWwindow* window);
+    
+    void execute();
+    EntityManager& getEntityManager();
     
-  private:
     friend void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods);
-
-    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;
-    Savefile save;
-    std::list<std::pair<double, std::function<void ()>>> scheduled;
+    
+  private:
+    EntityManager entityManager;
+    SystemManager systemManager;
+    GLFWwindow* const window;
     bool shouldQuit = false;
-    World world;
 };
 
-#endif
+#endif /* end of include guard: GAME_H_1014DDC9 */