From: Clyne Sullivan <tullivan99@gmail.com>
Date: Fri, 28 Oct 2016 13:19:40 +0000 (-0400)
Subject: npc dialog
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=e51b9ee1e0f9b8aeef98b8875f66260db0e7b502;p=clyne%2Fgamedev.git

npc dialog
---

e51b9ee1e0f9b8aeef98b8875f66260db0e7b502
diff --cc src/engine.cpp
index c50e7e7,148c496..152e3a4
--- a/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/world.cpp
index 0b0defc,7c53ee4..8f67d8b
--- a/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();