Worlds can be themed

2 files changed, 11 insertions, 13 deletions

diff --git a/include/Quest.h b/include/Quest.h
index cc01d27..8b1e142 100644
--- a/include/Quest.h
+++ b/include/Quest.h
@@ -20,21 +20,18 @@
 

 #define DEBUG

 

+struct need_t {

+	std::string name;

+	int n;

+};

+

 typedef struct {

 	std::string title;

 	std::string desc;

 	struct item_t reward;

+	std::vector<struct need_t> need;

 } Quest;

 

-/*class Quest {

-public:

-	char *title;

-	char *desc;

-	struct item_t reward;

-	Quest(const char *t,const char *d,struct item_t r);

-	~Quest();

-};*/

-

 /**

  * The Quest Handler class.

  * 

@@ -50,26 +47,26 @@ public:
 	 * Adds a quest to the current quest vector by its title.

 	 */

 	

-	int assign(const char *t);

+	int assign(std::string title,std::string desc,std::string req);

 	

 	/**

 	 * Drops a quest through its title.

 	 */

 	

-	int drop(const char *t);

+	int drop(std::string title);

 	

 	/**

 	 * Finishes a quest through it's title, also giving a pointer to the Entity

 	 * that gave the quest originally.

 	 */

 	

-	int finish(const char *t,void *completer);

+	int finish(std::string t);

 	

 	/**

 	 * Returns true if this handler is currently taking the quest.

 	 */

 	

-	bool hasQuest(const char *t);

+	bool hasQuest(std::string t);

 };

 

 #endif // QUEST_H

diff --git a/include/inventory.h b/include/inventory.h
index e5209de..af859a5 100644
--- a/include/inventory.h
+++ b/include/inventory.h
@@ -48,6 +48,7 @@ public:
 	
 	int addItem(std::string name,uint count);
 	int takeItem(std::string name,uint count);
+	int hasItem(std::string name);
 	
 	int useItem(void);
 	bool detectCollision(vec2,vec2);