From e03619c9dd92cf044cc06090af4061bbebd2cb76 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Wed, 2 Dec 2015 07:38:27 -0500
Subject: fixed item dialog

---
 src/entities.cpp | 21 +++++++++++----------
 src/gameplay.cpp |  3 ---
 2 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/entities.cpp b/src/entities.cpp
index 7dc561b..1e6fad5 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -341,17 +341,18 @@ void NPC::interact(){ //have the npc's interact back to the player
 
 extern void waitForDialog(void);
 void Object::interact(void){
-	if(questObject){
-		char opt[]=":Yes:No";
-		ui::dialogBox("You",opt,pickupDialog);
-		do{
-			if(ui::dialogOptChosen == 1 && this->alive == true){
-				player->inv->addItem((ITEM_ID)(identifier), (char)1);
-				this->alive = false;
-			}
-		}while(ui::dialogBoxExists);
+	if(questObject && alive){
+		
+		ui::dialogBox("You",":Yes:No",pickupDialog);		
+		while(ui::dialogBoxExists);
+
+		if(ui::dialogOptChosen == 1 && alive){
+			player->inv->addItem((ITEM_ID)(identifier), (char)1);
+			alive = false;
+			return;
+		}	
 	}else{
-		this->alive = false;
+		alive = false;
 		player->inv->addItem((ITEM_ID)(identifier), (char)1);
 	}
 }
diff --git a/src/gameplay.cpp b/src/gameplay.cpp
index a4fec88..cc9ae6a 100644
--- a/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@ -76,11 +76,8 @@ void initEverything(void){
 	playerSpawnHill=new World();
 	
 	playerSpawnHill->setBackground(BG_FOREST);
-<<<<<<< Updated upstream
 	playerSpawnHill->generateFunc(1280,playerSpawnHillFunc);
 	//playerSpawnHill->generate(1920);
-=======
->>>>>>> Stashed changes
 
 	/*
 	 *	Setup the current world, making the player initially spawn in `test`.
-- 
cgit v1.2.3