Merge branch 'master' of http://github.com/tcsullivan/gamedev

1 files changed, 25 insertions, 6 deletions

diff --git a/src/entities.cpp b/src/entities.cpp
index 08af0a9..fc2c316 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -102,6 +102,8 @@ NPC::NPC(){	//sets all of the NPC specific traits on object creation
 	
 	tex = new Texturec(1,"assets/NPC.png");
 	inv = new Inventory(NPC_INV_SIZE);
+	
+	randDialog = rand() % 10;
 }
 NPC::~NPC(){
 	while(!aiFunc.empty()){
@@ -307,26 +309,43 @@ void NPC::addAIFunc(int (*func)(NPC *),bool preload){
 	else aiFunc.push_back(func);
 }
 
+const char *randomDialog[10] = {
+	"What a beautiful day it is.",
+	"Have you ever went fast? I have.",
+	"I heard if you complete a quest, you'll get a special reward."
+	"How much wood could a woodchuck chuck if a woodchuck could chuck wood?",
+	"I don\'t think anyone has ever been able to climb up that hill.",
+	"If you ever see a hole in the ground, watch out; it could mean the end for you.",
+	"Did you know this game has over 4000 lines of code? I didn\'t. I didn't even know I was in a game until now...",
+	"HELP MY CAPS LOCK IS STUCK",
+	"You know, if anyone ever asked me who I wanted to be when I grow up, I would say Abby Ross.",
+	"I want to have the wallpaper in our house changed. It doesn\'t really fit the environment."
+};
+
 void NPC::interact(){ //have the npc's interact back to the player
 	int (*func)(NPC *);
 	loc.y += 5;
+	
+	canMove=false;
+	left = (player->loc.x < loc.x);
+	right = !left;
+	
 	if(aiFunc.size()){
 		func=aiFunc.front();
-		canMove=false;
-		
-		left = (player->loc.x < loc.x);
-		right = !left;
 		
 		if(!func(this)){
 			if(aiFunc.size())aiFunc.erase(aiFunc.begin());
 		}
-		canMove=true;
+	}else{
+		ui::dialogBox(name,NULL,randomDialog[randDialog]);
 	}
+	ui::waitForDialog();
+	canMove=true;
 }
 
 void Object::interact(void){
 	if(questObject && alive){
-		ui::dialogBox("You",":Yes:No",pickupDialog);		
+		ui::dialogBox(player->name,":Yes:No",pickupDialog);		
 		ui::waitForDialog();
 		if(ui::dialogOptChosen == 1){
 			player->inv->addItem((ITEM_ID)(identifier), (char)1);