Merge branch 'master' of https://github.com/tcsullivan/gamedev

1 files changed, 7 insertions, 2 deletions

diff --git a/include/entities.h b/include/entities.h
index 5deaa00..e50c77a 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -10,9 +10,9 @@ public:
 	float speed;
 	int type;
 	vec2 loc;
-	vec2 loci;
 	vec2 vel;
-	vec2 velg;
+	bool right,left;
+
 	void spawn(float, float);
 };
 
@@ -22,4 +22,9 @@ public:
 	~Player();
 };
 
+class NPC : public Entities{
+public:
+	NPC();
+};
+
 #endif // ENTITIES_H