From 820bd80587b5dbba1f9a174ca17c5461880b97c1 Mon Sep 17 00:00:00 2001 From: Clyne Sullivan Date: Thu, 10 Sep 2015 15:51:18 -0400 Subject: more fixes :) --- include/entities.h | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) (limited to 'include/entities.h') diff --git a/include/entities.h b/include/entities.h index 89d9ec3..5f0c9ee 100644 --- a/include/entities.h +++ b/include/entities.h @@ -1,10 +1,8 @@ -<<<<<<< HEAD #ifndef ENTITIES_H #define ENTITIES_H #include - class Entities{ public: float width; @@ -27,31 +25,4 @@ public: ~Player(); }; -======= -#ifndef ENTITIES_H -#define ENTITIES_H - -#include - - -class Entities{ -public: - float width; - float height; - float speed; - int type; - vec2 loc; - - void spawn(float, float); - - -}; - -class Player : public Entities{ -public: - Player(); - ~Player(); -}; - ->>>>>>> origin/master -#endif //ENTITIES_H \ No newline at end of file +#endif // ENTITIES_H -- cgit v1.2.3