diff options
author | Clyne Sullivan <tullivan99@gmail.com> | 2016-10-23 18:05:12 -0500 |
---|---|---|
committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-10-23 18:05:12 -0500 |
commit | 2dd2f42ff1c683331e7192b4bfb832e41543d2df (patch) | |
tree | 50a8c022ed2f38cfae462296b28cd1543e4db42c /src/engine.cpp | |
parent | b32c68a5a4bfb06f321a1d78357c65458b24e760 (diff) |
scriptable tags, inv. system
Diffstat (limited to 'src/engine.cpp')
-rw-r--r-- | src/engine.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/engine.cpp b/src/engine.cpp index 54181c8..a367e27 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -3,7 +3,7 @@ #include <config.hpp> #include <world.hpp> #include <ui.hpp> -//#include <inventory.hpp> +#include <inventory.hpp> #include <window.hpp> #include <components.hpp> #include <player.hpp> @@ -22,11 +22,10 @@ void Engine::init(void) { systems.add<WindowSystem>(); systems.add<RenderSystem>(); systems.add<InputSystem>(); -// systems.add<InventorySystem>(); + systems.add<InventorySystem>(); systems.add<WorldSystem>(); systems.add<PlayerSystem>(); systems.add<MovementSystem>(); -// systems.add<PlayerSystem>(&player); systems.configure(); @@ -37,6 +36,7 @@ void Engine::render(entityx::TimeDelta dt) { systems.update<RenderSystem>(dt); systems.update<WindowSystem>(dt); + systems.update<InventorySystem>(dt); ui::fadeUpdate(); } @@ -44,8 +44,6 @@ void Engine::render(entityx::TimeDelta dt) void Engine::update(entityx::TimeDelta dt) { systems.update<InputSystem>(dt); -// systems.update<InventorySystem>(dt); -// systems.update<PlayerSystem>(dt); systems.update<MovementSystem>(dt); systems.update<WorldSystem>(dt); systems.update<PlayerSystem>(dt); |