From 8deee144293102d4498424c38161d13c877250b2 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Wed, 30 Sep 2015 08:51:10 -0400
Subject: quest stuff

---
 include/Quest.h    | 13 +++++--------
 include/common.h   |  1 +
 include/entities.h |  1 +
 3 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'include')

diff --git a/include/Quest.h b/include/Quest.h
index c73bf79..076b800 100644
--- a/include/Quest.h
+++ b/include/Quest.h
@@ -1,26 +1,23 @@
 #ifndef QUEST_H
 #define QUEST_H
 
-#include <common.h>
+#include <vector>
+#include <cstdlib>
 #include <cstring>
 
-#define QUEST_LIMIT 5
 #define TOTAL_QUESTS 1
 
 class Quest {
 public:
 	char *title,*desc;
-	unsigned int xp;
-	Quest(const char *t,const char *d,unsigned int x);
+	unsigned int reward;
+	Quest(const char *t,const char *d,unsigned int r);
 	~Quest();
 };
 
 class QuestHandler {
-private:
-	unsigned char ccnt;
-	const Quest *current[QUEST_LIMIT];
 public:
-	QuestHandler();
+	std::vector<const Quest *>current;
 	int assign(const char *t);
 	int drop(const char *t);
 	int finish(const char *t);
diff --git a/include/common.h b/include/common.h
index 8410f58..5dfbb78 100644
--- a/include/common.h
+++ b/include/common.h
@@ -20,6 +20,7 @@ enum _TYPE { //these are the main types of entities
 	NPCT       = 1
 };
 
+#include <Quest.h>
 #include <entities.h>
 
 #define SCREEN_WIDTH  1280
diff --git a/include/entities.h b/include/entities.h
index 9e0257f..aa7eff9 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -37,6 +37,7 @@ private:
 
 class Player : public Entity{
 public:
+	QuestHandler qh;
 	Player();
 	void interact();
 };
-- 
cgit v1.2.3