aboutsummaryrefslogtreecommitdiffstats
path: root/src/engine.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine.cpp')
-rw-r--r--src/engine.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/engine.cpp b/src/engine.cpp
index e53a688..f81312b 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -6,6 +6,7 @@
//#include <inventory.hpp>
#include <window.hpp>
#include <components.hpp>
+#include <player.hpp>
extern World *currentWorld;
@@ -23,7 +24,8 @@ void Engine::init(void) {
systems.add<InputSystem>();
// systems.add<InventorySystem>();
systems.add<WorldSystem>();
- systems.add<MovementSystem>();
+ systems.add<PlayerSystem>();
+ systems.add<MovementSystem>();
// systems.add<PlayerSystem>(&player);
systems.configure();
@@ -35,7 +37,7 @@ void Engine::render(entityx::TimeDelta dt)
{
systems.update<RenderSystem>(dt);
systems.update<WindowSystem>(dt);
-
+
}
void Engine::update(entityx::TimeDelta dt)
@@ -45,13 +47,14 @@ void Engine::update(entityx::TimeDelta dt)
// systems.update<PlayerSystem>(dt);
systems.update<MovementSystem>(dt);
systems.update<WorldSystem>(dt);
+ systems.update<PlayerSystem>(dt);
}
namespace game {
entityx::EventManager events;
entityx::EntityManager entities (events);
- SpriteLoader sprite_l;
+ SpriteLoader sprite_l;
Engine engine;
}