From 17b4275fae1f6c5642156c73784622772d235c42 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Thu, 20 Oct 2016 20:16:21 -0500
Subject: playersystem, move cat

---
 src/engine.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/engine.cpp')

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;
 }
-- 
cgit v1.2.3