Fire Pit

2 files changed, 9 insertions, 3 deletions

diff --git a/include/entities.h b/include/entities.h
index d7ad2c0..fe0d014 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -43,7 +43,8 @@ enum BUILD_SUB{
 	HOUSE3 = 3,
 	HOUSE4 = 4,
 	FOUNTAIN = 5,
-	LAMP_POST = 6
+	LAMP_POST = 6,
+	FIRE_PIT = 7
 };
 
 typedef struct {
@@ -83,6 +84,8 @@ public:
 	Color color;
 	int duration;
 	bool canMove;
+	bool fountain;
+	bool gravity;
 	Particles(float x, float y, float w, float h, float vx, float vy, Color c, int d){
 		loc.x = (x);
 		loc.y = (y);
@@ -94,6 +97,8 @@ public:
 		color.green = (c.green);
 		color.blue = (c.blue);
 		duration = d;
+		fountain = false;
+		gravity = true;
 	}
 	~Particles(){}
 	void draw(){
@@ -102,8 +107,9 @@ public:
 	}
 	bool kill(float delta){
 		duration -= delta;
-		if(duration <= 0)
+		if(duration <= 0){
 			return true;
+		}
 		else return false;
 	}
 };
diff --git a/include/world.h b/include/world.h
index ef37365..7f22cba 100644
--- a/include/world.h
+++ b/include/world.h
@@ -177,7 +177,7 @@ public:
 	std::vector<Light        >  light;
 	
 	void addStructure(BUILD_SUB sub,float x,float y,World *inside);
-	void addVillage(int bCount, int npcMin, int npcMax,World *inside);
+	void addVillage(int x, int y, int bCount, int npcMin, int npcMax,World *inside);
 	void addMob(int t,float x,float y);
 	void addMob(int t,float x,float y,void (*hey)(Mob *));
 	void addNPC(float x,float y);