1 files changed, 3 insertions, 14 deletions
diff --git a/src/engine.cpp b/src/engine.cpp
index aa0db73..d334aea 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -23,7 +23,7 @@ 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<QuestSystem>();
@@ -38,22 +38,11 @@ void Engine::init(void) {
     systems.configure();
 
     ui::initSounds();
+	ui::menu::init();
 	game::config::update();
 	getSystem<PlayerSystem>()->create();
 }
 
-void Engine::render(entityx::TimeDelta dt)
-{
-    systems.update<RenderSystem>(dt);
-    //systems.update<InventorySystem>(dt); // doesn't do anything...
-
-	ui::fadeUpdate();
-}
-void Engine::resetRender(entityx::TimeDelta dt)
-{
-	systems.update<WindowSystem>(dt);
-}
-
 void Engine::update(entityx::TimeDelta dt)
 {
     systems.update<InputSystem>(dt);
@@ -69,7 +58,7 @@ void Engine::update(entityx::TimeDelta dt)
 
 namespace game {
 	entityx::EventManager events;
-	entityx::EntityManager entities (events);
+	LockableEntityManager entities (events);
 	//SpriteLoader sprite_l;
 
     Engine engine;