Work on merchants and yer mum

5 files changed, 124 insertions, 50 deletions

diff --git a/include/common.h b/include/common.h
index cbfc507..557e582 100644
--- a/include/common.h
+++ b/include/common.h
@@ -54,6 +54,11 @@ extern GLuint colorIndex;
  */
 
 typedef struct {
+	int x;
+	int y;
+} ivec2;
+
+typedef struct {
 	float x;
 	float y;
 } vec2;
@@ -75,7 +80,7 @@ typedef struct {
 	vec2 end;
 } Ray;
 
-struct col{
+struct col {
 	float red;
 	float green;
 	float blue;
@@ -184,23 +189,6 @@ extern unsigned int loops;
 extern GLuint shaderProgram;
 
 /**
- * This class contains a string for identification and a value. It can be used to
- * save certain events for and decisions so that they can be recalled later.
- */
-
-class Condition {
-private:
-	char *id;
-	void *value;
-public:
-	Condition(const char *_id,void *val);
-	~Condition();
-	
-	bool sameID(const char *s);
-	void *getValue(void);
-};
-
-/**
  *	Prints a formatted debug message to the console, along with the callee's file and line
  *	number.
  */
@@ -242,6 +230,4 @@ int strCreateFunc(const char *equ);
 template<typename N, size_t s>
 size_t arrAmt(N (&)[s]){return s;}
 
-extern void *NULLPTR;
-
 #endif // COMMON_H
diff --git a/include/entities.h b/include/entities.h
index 6c8e658..545f0a4 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -52,6 +52,24 @@ enum BUILD_SUB{
 	STALL_TRADER = 71
 };
 
+class BuySell{
+public:
+	int member;
+	union{
+		struct{
+			std::string item1;
+			std::string item2;
+		}trade;
+		struct{
+			enum type{BUY,SELL};
+			std::string item;
+			int price;
+		}cost;
+	};
+	BuySell(){}
+	~BuySell(){}
+};
+
 class World;
 
 class Particles{
@@ -199,18 +217,7 @@ public:
 
 class Merchant : public NPC{
 public:
-	union BSINV{
-		struct EQUAL{
-			std::string item1;
-			std::string item2;
-		};
-
-		struct COST{
-			std::string item;
-			int price;
-		};
-	};
-	std::vector<BSINV>bsinv;
+	std::vector<BuySell>bsinv;
 	void interact();
 
 	Merchant();
diff --git a/include/threadpool.h b/include/threadpool.h
new file mode 100644
index 0000000..c341673
--- /dev/null
+++ b/include/threadpool.h
@@ -0,0 +1,53 @@
+#ifndef THREADPOOL_H
+#define THREADPOOL_H
+
+#include <vector>
+#include <queue>
+#include <thread>
+#include <mutex>
+#include <condition_variable>
+#include <iostream>
+#include <unistd.h>
+
+using namespace std;
+
+class ThreadPool
+{
+public:
+
+    // Constructor.
+    ThreadPool(int threads);
+
+    // Destructor.
+    ~ThreadPool();
+
+    // Adds task to a task queue.
+    void Enqueue(function<void()> f);
+
+    // Shut down the pool.
+    void ShutDown();
+
+private:
+    // Thread pool storage.
+    vector<thread> threadPool;
+
+    // Queue to keep track of incoming tasks.
+    queue<function<void()>> tasks;
+
+    // Task queue mutex.
+    mutex tasksMutex;
+
+    // Condition variable.
+    condition_variable condition;
+
+    // Indicates that pool needs to be shut down.
+    bool terminate;
+
+    // Indicates that pool has been terminated.
+    bool stopped;
+
+    // Function that will be invoked by our threads.
+    void Invoke();
+};
+
+#endif //THRE
\ No newline at end of file
diff --git a/include/ui.h b/include/ui.h
index 0499570..667a581 100644
--- a/include/ui.h
+++ b/include/ui.h
@@ -22,7 +22,6 @@ typedef void(*menuFunc)();
 struct menuItem{
 	int member;
 	union{
-
 		struct{
 			vec2 loc;
 			dim2 dim;
@@ -30,7 +29,6 @@ struct menuItem{
 			const char* text;
 			menuFunc func;
 		}button;
-
 		struct{
 			vec2 loc;
 			dim2 dim;
@@ -148,7 +146,8 @@ namespace ui {
 	*/
 	
 	void dialogBox(const char *name,const char *opt,bool passive,const char *text,...);
-	void merchantBox(const char *name,const char *opt,bool passive,const char *text,...);
+	void merchantBox(const char *name, std::vector<BuySell> *items, const char *opt,bool passive,const char *text,...);
+	void merchantBox();
 	void waitForDialog(void);
 	
 	/*
@@ -187,7 +186,6 @@ namespace ui {
 	void toggleWhiteFast(void);
 	void waitForCover(void);
 	
-	void waitForNothing(unsigned int);
 }
 
 #endif // UI_H
diff --git a/include/world.h b/include/world.h
index 7338097..228defa 100644
--- a/include/world.h
+++ b/include/world.h
@@ -81,24 +81,54 @@ typedef struct line_t {
 	unsigned char color;	/**< Lightness of dirt (brown) */
 } line_t;
 
-/*
- * Handle all logic that has to do with villages
+class World;
+
+/**
+ * The village class, used to group structures into villages.
  */
 
+class Village {
+public:
+
+	/**
+	 * The name of the village.
+	 */
 
-struct Village{
 	std::string name;
+	
+	/**
+	 * The coordinate of where the village starts.
+	 * 
+	 * This is used to check if the player has entered the village's area.
+	 */
+	
 	vec2 start;
+	
+	/**
+	 * The coordinate of where the village ends.
+	 * 
+	 * This is used to check if the player has entered the village's area.
+	 */
+	
 	vec2 end;
+	
+	/**
+	 * TODO
+	 */
+	
 	bool in;
 
+	/**
+	 * A vector of all structures that are associated with this village.
+	 */
+
 	std::vector<Structures *> build;
-	Village(const char *meme){
-		name = meme;
-		end.x = -0xffffffff;
-		start.x = 0xffffffff;
-		in = false;
-	}
+	
+	/**
+	 * Creates a village of name `meme` in the world `w`.
+	 */
+	
+	Village(const char *meme, World *w);
 };
 
 extern Player *player;
@@ -134,8 +164,6 @@ protected:
 	 */
 	
 	void singleDetect(Entity *e);
-
-	static void villageLogic(World *world);
 	
 	/**
 	 * Empties all entity vectors.
@@ -260,6 +288,11 @@ public:
 	
 	std::vector<Particles	*>	particles;
 	
+	
+	
+	
+	std::vector<Village *	 >	village;
+	
 	/**
 	 * A vector of all light elements in this world.
 	 */
@@ -271,9 +304,6 @@ public:
 	 */
 
 	std::vector<std::string  >  sTexLoc;
-
-	std::vector<Village>village;
-
 	
 	/**
 	 * NULLifies pointers and allocates necessary memory. This should be