Merge branch 'master' of https://github.com/tcsullivan/gamedev

2 files changed, 16 insertions, 1 deletions

diff --git a/src/components.cpp b/src/components.cpp
index 05f4714..6f243a7 100644
--- a/src/components.cpp
+++ b/src/components.cpp
@@ -35,6 +35,8 @@ void MovementSystem::update(entityx::EntityManager &en, entityx::EventManager &e
 					fl = (direction.x < 0);
 			}
 
+			// make the entity wander
+			// TODO initialX and range?
 			if (entity.has_component<Wander>()) {
 				auto& countdown = entity.component<Wander>()->countdown;
 
@@ -231,6 +233,17 @@ void DialogSystem::receive(const MouseClickEvent &mce)
 							} while((qxml = qxml->NextSiblingElement()));
 						}
 
+						auto xxml = exml->FirstChildElement("option");
+						std::string options;
+						std::vector<int> optionNexts;
+						if (xxml != nullptr) {
+							do {
+								options += '\"' + xxml->StrAttribute("name");
+								optionNexts.emplace_back(xxml->IntAttribute("value"));
+								xxml = xxml->NextSiblingElement();
+							} while (xxml != nullptr);
+						}
+
 						auto cxml = exml->FirstChildElement("content");
 						const char *content;
 						if (cxml == nullptr) {
@@ -240,7 +253,7 @@ void DialogSystem::receive(const MouseClickEvent &mce)
 							while (*++content && isspace(*content));
 						}
 
-						ui::dialogBox(name.name, "", false, content);
+						ui::dialogBox(name.name, options, false, content);
 						ui::waitForDialog();
 
 						if (!questAssignedText.empty())
diff --git a/src/world.cpp b/src/world.cpp
index a26a4fa..08426a8 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -375,6 +375,8 @@ void WorldSystem::load(const std::string& file)
 						entity.assign<Grounded>();
 					} else if (tname == "Wander") {
 						entity.assign<Wander>();
+					} else if (tname == "Hop" ) {
+						entity.assign<Hop>();
 					} else if (tname == "Animation") {
 						auto entan = entity.assign<Animate>();
 						auto animx = abcd->FirstChildElement();