npc dialog

4 files changed, 24 insertions, 1 deletions

diff --git a/src/components.cpp b/src/components.cpp
index 220ecab..c7069ce 100644
--- a/src/components.cpp
+++ b/src/components.cpp
@@ -94,6 +94,7 @@ void RenderSystem::update(entityx::EntityManager &en, entityx::EventManager &ev,
 	en.each<Visible, Position, Solid, Name>([](entityx::Entity e, Visible &v, Position &pos, Solid& dim, Name &name) {
 		(void)e;
 		(void)v;
+		ui::setFontZ(-5.0);
 		ui::putStringCentered(pos.x + dim.width / 2, pos.y - ui::fontSize - HLINES(0.5), name.name);
 	});
 }
diff --git a/src/engine.cpp b/src/engine.cpp
index c50e7e7..152e3a4 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -48,7 +48,6 @@ void Engine::render(entityx::TimeDelta dt)
 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);
diff --git a/src/ui.cpp b/src/ui.cpp
index 3a4a22e..e9738cf 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -303,9 +303,11 @@ namespace ui {
 		 *	Draw the character:
 		*/
 
+
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D,(*ftex)[c-33]);
 		glUniform1i(Render::textShader.uniform[WU_texture], 0);
+		glUniform4f(Render::textShader.uniform[WU_tex_color], 1.0f, 1.0f, 1.0f, 1.0f);
 
 		//glDisable(GL_DEPTH_TEST);
 
diff --git a/src/world.cpp b/src/world.cpp
index 0b0defc..8f67d8b 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -363,6 +363,8 @@ void WorldSystem::load(const std::string& file)
 						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();
@@ -1006,6 +1008,25 @@ void WorldSystem::update(entityx::EntityManager &en, entityx::EventManager &ev,
 
 void WorldSystem::detect(entityx::TimeDelta dt)
 {
+	game::entities.each<Grounded, Position, Solid>(
+		[&](entityx::Entity e, Grounded &g, Position &loc, Solid &dim) {
+			(void)e;
+			if (!g.grounded) {
+				// get the line the entity is on
+				int line = std::clamp(static_cast<int>((loc.x + dim.width / 2 - world.startX) / game::HLINE),
+									  0,
+									  static_cast<int>(world.data.size()));
+
+				// make sure entity is above ground
+				const auto& data = world.data;
+				if (loc.y != data[line].groundHeight) {
+					loc.y = data[line].groundHeight;
+					e.remove<Grounded>();
+				}
+			}
+
+		});
+	
 	game::entities.each<Direction, Physics>(
 		[&](entityx::Entity e, Direction &vel, Physics &phys) {
 			(void)e;