4 files changed, 16 insertions, 22 deletions
diff --git a/include/bmpimage.hpp b/include/bmpimage.hpp
index 5e056fe..69b78ac 100644
--- a/include/bmpimage.hpp
+++ b/include/bmpimage.hpp
@@ -1,5 +1,3 @@
-#ifndef __WIN32__
-
 #ifndef BMP_IMAGE_HPP
 #define BMP_IMAGE_HPP
 
@@ -34,5 +32,3 @@ typedef struct {
 } __attribute__((packed)) BITMAPINFOHEADER;
 
 #endif // BMP_IMAGE_HPP
-
-#endif // __WIN32__
-\ No newline at end of file
diff --git a/include/quest.hpp b/include/quest.hpp
index be9755f..3358d8f 100644
--- a/include/quest.hpp
+++ b/include/quest.hpp
@@ -71,6 +71,13 @@ public:
 	 * @return if the quest is active.
 	 */
 	static bool hasQuest(std::string title);
+	
+	static inline auto getQuestTitles(void) {
+		std::forward_list<std::string> titles;
+		for (const auto& q : current)
+			titles.emplace_front(q.name);
+		return titles;
+	}
 };
 
 #endif // QUEST_HPP_
diff --git a/include/thread.hpp b/include/thread.hpp
index 0dd20f9..63e441a 100644
--- a/include/thread.hpp
+++ b/include/thread.hpp
@@ -1,12 +1,7 @@
 #ifndef THREAD_HPP_
 #define THREAD_HPP_
 
-#ifndef __WIN32__
 #include <thread>
-#else
-#include <win32thread.hpp>
-#endif // __WIN32__
-
 #include <atomic>
 #include <entityx/entityx.h>
 
diff --git a/include/ui_quest.hpp b/include/ui_quest.hpp
index d9d1708..e06570a 100644
--- a/include/ui_quest.hpp
+++ b/include/ui_quest.hpp
@@ -5,6 +5,7 @@
 #ifndef UI_QUEST_HPP_
 #define UI_QUEST_HPP_
 
+#include <quest.hpp>
 #include <ui.hpp>
 #include <vector2.hpp>
 
@@ -27,13 +28,9 @@ namespace ui {
 		 * Draws the quest UI to the screen, if enabled.
 		 */
 		void draw(void) {
-//			static unsigned int textWrap = 40;
-
 			if (!_toggle)
 				return;
-
-//			std::swap(textWrap, ui::textWrapLimit);
-
+			
 			float top_y = offset.y + 200;
 			ui::drawNiceBox(vec2 {offset.x - 200, top_y },
 			                vec2 {offset.x + 200, offset.y - 200 },
@@ -41,16 +38,15 @@ namespace ui {
 
 			UISystem::putStringCentered(vec2(offset.x, top_y - 40), "Current Quests:");
 			
-			/*auto y = top_y - 100;
+			const auto& titles = QuestSystem::getQuestTitles();
+			auto y = top_y - 100;
 			const auto x = offset.x - 180;
-			for (const auto &q : player->qh.current) {
-				ui::putText(x, y, q.title.c_str());
+			for (const auto t : titles) {
+				UISystem::putString(vec2(x, y), t);
 				y -= 20;
-				ui::putText(x + 40, y, q.desc.c_str());
-				y -= 40; 
-			}*/
-
-//			std::swap(textWrap, ui::textWrapLimit);
+				//ui::putText(x + 40, y, q.desc.c_str());
+				//y -= 40; 
+			}
 		}
 	}
 }