merge

2 files changed, 60 insertions, 19 deletions

diff --git a/src/entities.cpp b/src/entities.cpp
index 127adae..565c369 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -23,14 +23,13 @@ void Entity::spawn(float x, float y){	//spawns the entity you pass to it based o
 void Entity::draw(void){		//draws the entities
 	glPushMatrix();
 	if(type==NPCT){
-		if(gender == MALE){
-			glColor3ub(255,255,255);
-		}else if(gender == FEMALE){
-			glColor3ub(255,105,180);
-		}
 		if(NPCp(this)->aiFunc.size()){
 			glColor3ub(255,255,0);
 			glRectf(loc.x+width/3,loc.y+height,loc.x+width*2/3,loc.y+height+width/3);
+		}if(gender == MALE){
+			glColor3ub(255,255,255);
+		}else if(gender == FEMALE){
+			glColor3ub(255,105,180);
 		}
 	}else{
 		glColor3ub(255,255,255);
@@ -89,18 +88,6 @@ void Entity::draw(void){		//draws the entities
 	}
 }
 
-void Entity::wander(int timeRun, vec2 *v){ //this makes the entites wander about
-	static int direction;	//variable to decide what direction the entity moves
-	if(ticksToUse == 0){
-		ticksToUse = timeRun;
-		v->x = .008*HLINE;	//sets the inital velocity of the entity
-		direction = (getRand() % 3 - 1); 	//sets the direction to either -1, 0, 1
-											//this lets the entity move left, right, or stay still
-		v->x *= direction;	//changes the velocity based off of the direction
-	}
-	ticksToUse--; //removes one off of the entities timer
-}
-
 void Entity::getName(){
 	rewind(names);
 	char buf,*bufs = (char *)malloc(16);
@@ -167,6 +154,19 @@ NPC::NPC(){	//sets all of the NPC specific traits on object creation
 	inv = new Inventory(NPC_INV_SIZE);
 }
 
+void NPC::wander(int timeRun, vec2 *v){ //this makes the entites wander about
+	static int direction;	//variable to decide what direction the entity moves
+	if(ticksToUse == 0){
+		ticksToUse = timeRun;
+		v->x = .008*HLINE;	//sets the inital velocity of the entity
+		direction = (getRand() % 3 - 1); 	//sets the direction to either -1, 0, 1
+											//this lets the entity move left, right, or stay still
+		v->x *= direction;	//changes the velocity based off of the direction
+	}
+	ticksToUse--; //removes one off of the entities timer
+}
+
+
 void NPC::addAIFunc(int (*func)(NPC *)){
 	aiFunc.push_back(func);
 }
@@ -215,3 +215,36 @@ unsigned int Structures::spawn(_TYPE t, float x, float y){ //spawns a structure
 		return entity.size();
 	}
 }
+Mob::Mob(){
+	width = HLINE * 10;
+	height = HLINE * 8;
+	speed = 1;
+	type = MOBT; //sets type to MOB
+	subtype = 1; //SKIRL
+	alive = true;
+	canMove = true;
+	near = false;
+	texture[0] = loadTexture("assets/NPC.png");
+	texture[1] = 0;
+	texture[2] = 0;
+	inv = new Inventory(NPC_INV_SIZE);
+}
+
+void Mob::wander(int timeRun, vec2* v){
+	if(subtype == 1){ //SKIRL
+		static int direction;	//variable to decide what direction the entity moves
+		if(ticksToUse == 0){
+			ticksToUse = timeRun;
+			if(ground && direction != 0){
+				v->y=.08;
+				loc.y+=HLINE*1;
+				ground=false;
+				v->x = .008*HLINE;	//sets the inital velocity of the entity
+			}
+			direction = (getRand() % 3 - 1); 	//sets the direction to either -1, 0, 1
+												//this lets the entity move left, right, or stay still
+			v->x *= direction;	//changes the velocity based off of the direction
+		}
+		ticksToUse--; //removes one off of the entities timer
+	}
+}
\ No newline at end of file
diff --git a/src/gameplay.cpp b/src/gameplay.cpp
index a690203..57132f5 100644
--- a/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@ -8,6 +8,8 @@ extern std::vector<Entity*>entity;
 extern std::vector<NPC>npc;
 extern std::vector<Structures *>build;
 extern Player *player;
+extern std::vector<Mob>mob;
+
 
 extern void mainLoop(void);
 
@@ -56,11 +58,17 @@ void initEverything(void){
 	entity.push_back(new Entity());
 	build.push_back(new Structures());
 	entity[0]=build[0];
-	
-	build[0]->spawn(STRUCTURET,0,10);
+
+	build[0]->spawn(STRUCTURET,(rand()%120*HLINE),10);
 	IndoorWorld *iw=new IndoorWorld();
 	iw->generate(200);
 	build[0]->inside=iw;
+
+	entity.push_back(new Mob()); //create a new entity of NPC type
+	mob.push_back(Mob()); //create new NPC
+	entity[entity.size()] = &mob[mob.size()-1]; //set the new entity to have the same traits as an NPC
+	entity[entity.size()-1]->spawn(200,100); //sets the position of the villager around the village
+	entity.pop_back();
 	
 	NPCp(entity[1])->addAIFunc(giveTestQuest);
 	for(i=0;i<entity.size()+1;i++){