diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2015-09-10 15:51:18 -0400 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2015-09-10 15:51:18 -0400 |
| commit | 820bd80587b5dbba1f9a174ca17c5461880b97c1 (patch) | |
| tree | 6e78fb6ad55c0d61d9e74bef48c6ff6685443705 /include/entities.h | |
| parent | becacb292c902bbbc55a196ba824a9ff678481ff (diff) | |
more fixes :)
Diffstat (limited to 'include/entities.h')
| -rw-r--r-- | include/entities.h | 31 |
1 files changed, 1 insertions, 30 deletions
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 <common.h> - class Entities{ public: float width; @@ -27,31 +25,4 @@ public: ~Player(); }; -======= -#ifndef ENTITIES_H -#define ENTITIES_H - -#include <common.h> - - -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 |