npc dialog

diff --cc include/components.hpp
Simple merge

diff --cc src/components.cpp
Simple merge

diff --cc src/engine.cpp
index c50e7e7b4a4f14ee2c764b8bfcafcf495268e6a4,148c4961c4534b7a5d8fdd427a42353c44195ae0..152e3a4c69effb18447b6feb08778faedc2b8f37
--- 1/src/engine.cpp
--- 2/src/engine.cpp
+++ b/src/engine.cpp
@@@ -48,9 -46,7 +48,8 @@@ void Engine::render(entityx::TimeDelta 
  void Engine::update(entityx::TimeDelta dt)
  {
      systems.update<InputSystem>(dt);
-       //systems.update<PhysicsSystem>(dt);
        systems.update<MovementSystem>(dt);
 +      //systems.update<DialogSystem>(dt);
        systems.update<WorldSystem>(dt);
      systems.update<PlayerSystem>(dt);
  }

diff --cc src/ui.cpp
Simple merge

diff --cc src/world.cpp
index 0b0defc6fab9cc22320cdfb63362753922e41c9d,7c53ee45e2de999347254ea70ba7a1490a8b743b..8f67d8ba69c1e1618158e3902fe9b9807f53b3cb
--- 1/src/world.cpp
--- 2/src/world.cpp
+++ b/src/world.cpp
@@@ -361,8 -400,8 +361,10 @@@ void WorldSystem::load(const std::strin
                                                entity.assign<Physics>(g);
                                        } else if (tname == "Name") {
                                                entity.assign<Name>(coalesce(wxml->Attribute("name"), abcd->Attribute("value"))); 
 +                                      } else if (tname == "Dialog") {
 +                                              entity.assign<Dialog>();
+                                       } else if (tname == "Grounded") {
+                                               entity.assign<Grounded>();
                                        }
  
                                        abcd = abcd->NextSiblingElement();

diff --cc xml/entities.xml
Simple merge