From 328a35846f24aa61524e27d7a08f99617f1b0e55 Mon Sep 17 00:00:00 2001
From: Andy Belle-Isle <abelleisle@roadrunner.com>
Date: Sat, 12 Sep 2015 21:17:12 -0400
Subject: Updated village spawning with fixes to other things

---
 include/entities.h | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/entities.h b/include/entities.h
index 7cd657a..752908b 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -8,7 +8,7 @@ public:
 	float width;
 	float height;
 	float speed;
-	int type;
+	int type, subtype;
 	vec2 loc;
 	vec2 vel;
 	bool right,left;
@@ -20,7 +20,6 @@ public:
 class Player : public Entity{
 public:
 	Player();
-	~Player();
 };
 
 class NPC : public Entity{
@@ -28,4 +27,13 @@ public:
 	NPC();
 };
 
+extern Entity *entnpc[10];	//The NPC base
+extern NPC npc[10];
+
+class Structures : public Entity{
+public:
+	Structures();
+	void spawn(int, float, float);
+};
+
 #endif // ENTITIES_H
-- 
cgit v1.2.3