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

1 files changed, 14 insertions, 7 deletions

diff --git a/src/entities.cpp b/src/entities.cpp
index 8d582a1..754c777 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -3,19 +3,26 @@
 void Entities::spawn(float x, float y){
 	loc.x = x;
 	loc.y = y;
-	loci.x = loc.x;
-	loci.y = loc.y;
 	vel.x = 0;
 	vel.y = 0;
-	velg.x = 0;
-	velg.y = 0;
+	right = false;
+	left = false;
 }
 
 Player::Player(){
-	width = HLINE * 6;
-	height = HLINE * 16;
+	width = HLINE * 8;
+	height = HLINE * 18;
 	speed = 1;
 	type = 0;
 }
 
-Player::~Player(){}
+Player::~Player(){
+
+}
+
+NPC::NPC(){
+	width = HLINE * 8;
+	height = HLINE * 18;
+	speed = 1;
+	type = 0;
+}