From c8b859da1c52205973ad853eec91bf5a7cb882bb Mon Sep 17 00:00:00 2001
From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Mon, 28 Sep 2015 08:13:09 -0400
Subject: Fixed entities

---
 src/entities.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/entities.cpp')

diff --git a/src/entities.cpp b/src/entities.cpp
index da28851..d31f427 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -50,9 +50,9 @@ NPC::NPC(){
 	width = HLINE * 8;
 	height = HLINE * 12;
 	speed = 1;
-	type = 0;
+	type = 1;
 	subtype = 0;
-	alive = false;
+	alive = true;
 	canMove = true;
 }
 
@@ -78,14 +78,15 @@ unsigned int Structures::spawn(int t, float x, float y){
 		//int tempN = (getRand() % 5 + 1);
 		int tempN = 2;
 		for(int i=0;i<tempN;i++){
-			entity.push_back(new Entity());
+			entity.push_back(new NPC());
 			npc.push_back(NPC());
 			std::cout<<"NPC:"<<npc.size()<<std::endl;
 			std::cout<<"Entity:"<<entity.size()<<std::endl;
 			entity[entity.size()] = &npc[npc.size()-1];
-			entity[entity.size()]->alive=true;
-			entity[entity.size()]->type = 1;
-			entity[entity.size()]->spawn(loc.x + (float)(i - 5) / 8,100);
+			entity[entity.size()-1]->spawn(loc.x + (float)(i - 5) / 8,100);
+			std::cout<<"Entity Type["<<entity.size()<<"]: "<<entity[entity.size()]->type<<std::endl;
+			std::cout<<"Entity Life["<<entity.size()<<"]: "<<entity[entity.size()]->alive<<std::endl;
+
 		}
 		return entity.size();
 	}
-- 
cgit v1.2.3