merge

1 files changed, 11 insertions, 10 deletions

diff --git a/src/entities.cpp b/src/entities.cpp
index 8608aeb..4a8e6b7 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -38,13 +38,9 @@ void getRandomName(Entity *e){
 	
 	bufs = new char[32];
 	
-	std::cout<<"1\n";
-	
 	for(;!names.eof();max++)
 		names.getline(bufs,32);
 	
-	std::cout<<"2\n";
-	
 	tempNum = rand() % max;
 	names.seekg(0,names.beg);
 	
@@ -218,13 +214,18 @@ Object::Object(){
 	inv = NULL;
 }
 
-Object::Object(ITEM_ID id, bool qo, const char *pd){
+Object::Object(ITEM_ID id, const char *pd){
 	identifier = id;
-	questObject = qo;
-	
-	pickupDialog = new char[strlen(pd)+1];
-	strcpy(pickupDialog,pd);
-	
+
+	if(pd){
+		pickupDialog = new char[strlen(pd)+1];
+		strcpy(pickupDialog,pd);
+		questObject = true;
+	}else{
+		pickupDialog = new char[1];
+		*pickupDialog = '\0';
+		questObject = false;
+	}
 
 	type = OBJECTT;
 	alive = true;