quest completion

1 files changed, 17 insertions, 7 deletions

diff --git a/src/Quest.cpp b/src/Quest.cpp
index 0151706..ac18021 100644
--- a/src/Quest.cpp
+++ b/src/Quest.cpp
@@ -1,5 +1,9 @@
 #include <Quest.h>

 

+#include <entities.h>

+

+extern Player *player;

+

 int QuestHandler::assign(const char *t){

 	return strcmp(t,"h");

 }

@@ -8,16 +12,22 @@ int QuestHandler::drop(const char *t){
 	return strcmp(t,"h");

 }

 

-int QuestHandler::finish(const char *t,void *completer){

-	return strncmp(t,(char *)completer,1);

+int QuestHandler::finish(std::string t){

+	for(unsigned int i=0;i<current.size();i++){

+		if(current[i].title == t){

+			if(!player->inv->takeItem(current[i].need.back(),1)){

+				current.erase(current.begin()+i);

+				return 1;

+			}else return 0;

+		}

+	}

+	return 0;

 }

 

-bool QuestHandler::hasQuest(const char *t){

-	unsigned int i;

-	for(i=0;i<current.size();i++){

-		if(!strcmp(current[i].title.c_str(),t)){

+bool QuestHandler::hasQuest(std::string t){

+	for(unsigned int i=0;i<current.size();i++){

+		if(current[i].title == t)

 			return true;

-		}

 	}

 	return false;

 }