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

5 files changed, 50 insertions, 2 deletions

diff --git a/.gitignore b/.gitignore
index 4398992..d913368 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ xml/*.dat
 brice.dat

 config/settings.xml

 setup.mk

+TODOS

diff --git a/include/components.hpp b/include/components.hpp
index ed9a136..1deaf69 100644
--- a/include/components.hpp
+++ b/include/components.hpp
@@ -302,7 +302,12 @@ struct Dialog {
 /**
  * Causes the entity to hop around.
  */
-struct Hop {}; // TODO require wander, for range?
+struct Hop {
+	Hop(float r = 0)
+		: hopRatio(r) {}
+
+	float hopRatio;
+};
 
 /**
  * Causes the entity to wander about.
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();
diff --git a/todo.sh b/todo.sh
new file mode 100755
index 0000000..5f053a2
--- /dev/null
+++ b/todo.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+#
+# Searches for all TODOs and tosses them in a file.
+#
+TODO_COUNT=0
+rm -f TODOS
+touch TODOS
+for file in include/*.hpp
+do
+	echo "########################################" >> TODOS
+	echo $file >> TODOS
+	echo "========================================" >> TODOS
+	grep -n -B 5 -A 5 "TODO" $file | sed s/--/========================================/g >> TODOS
+	TODO_COUNT=$((TODO_COUNT+$(grep -c "TODO" $file)))
+done
+
+for file in src/*.cpp
+do
+	echo "########################################" >> TODOS
+	echo $file >> TODOS
+	echo "========================================" >> TODOS
+	grep -n -B 5 -A 5 "TODO" $file | sed s/--/========================================/g >> TODOS
+	TODO_COUNT=$((TODO_COUNT+$(grep -c "TODO" $file)))
+done
+
+echo "Found" $TODO_COUNT "TODOs."