From 0075f9e7997d01fa2105bff38e40a3d5b8b421e6 Mon Sep 17 00:00:00 2001
From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Fri, 19 Feb 2016 18:33:29 -0500
Subject: Village work

---
 include/common.h |  1 +
 include/ui.h     |  1 +
 include/world.h  | 22 +++++++++++++++++++++-
 3 files changed, 23 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/common.h b/include/common.h
index 34260c9..f141afd 100644
--- a/include/common.h
+++ b/include/common.h
@@ -16,6 +16,7 @@
 #include <string>
 #include <fstream>	
 #include <thread>
+#include <mutex>
 
 #define GLEW_STATIC
 #include <GL/glew.h>
diff --git a/include/ui.h b/include/ui.h
index 38a4932..8d479a4 100644
--- a/include/ui.h
+++ b/include/ui.h
@@ -102,6 +102,7 @@ namespace ui {
 	extern bool			 dialogBoxExists;
 	extern unsigned char dialogOptChosen;
 	extern bool dialogImportant;
+	extern bool dialogPassive;
 
 	extern unsigned int textWrapLimit;
 
diff --git a/include/world.h b/include/world.h
index 43da6fc..edf7ebb 100644
--- a/include/world.h
+++ b/include/world.h
@@ -81,13 +81,29 @@ typedef struct line_t {
 	unsigned char color;	/**< Lightness of dirt (brown) */
 } line_t;
 
+/*
+ * Handle all logic that has to do with villages
+ */
+
+
+struct Village{
+	std::string name;
+
+	std::vector<std::shared_ptr<Entity>>	 entity;
+	std::vector<std::shared_ptr<Structures>> build;
+	std::vector<std::shared_ptr<NPC>>		 npc;
+
+	Village(const char *meme){
+		name = meme;
+	}
+};
+
 /**
  * The world class. This class does everything a world should do.
  */
 
 class World {
 protected:
-	
 	/**
 	 * The line array.
 	 * This array is created through 'new' in World::generate(), with an amount
@@ -113,6 +129,8 @@ protected:
 	 */
 	
 	void singleDetect(Entity *e);
+
+	static void villageLogic(World *world);
 	
 	/**
 	 * Empties all entity vectors.
@@ -244,6 +262,8 @@ public:
 
 	std::vector<std::string  >  sTexLoc;
 
+	std::vector<Village>village;
+
 	
 	/**
 	 * NULLifies pointers and allocates necessary memory. This should be
-- 
cgit v1.2.3