diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 3 | ||||
| -rw-r--r-- | include/entities.h | 7 | ||||
| -rw-r--r-- | include/ui.h | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/include/common.h b/include/common.h index aa175bc..922dd59 100644 --- a/include/common.h +++ b/include/common.h @@ -10,7 +10,8 @@ #include <SDL2/SDL_image.h> #include <SDL2/SDL_opengl.h> -typedef struct { float x; float y; } vec2; +typedef struct { float x; float y; } vec2; +enum _TYPE {STRUCTURET = -1, PLAYERT = 0, NPCT = 1}; #include <entities.h> diff --git a/include/entities.h b/include/entities.h index 78d9a51..df81ad2 100644 --- a/include/entities.h +++ b/include/entities.h @@ -9,7 +9,8 @@ public: float width; float height; float speed; - int type, subtype; + int subtype; + _TYPE type; vec2 loc; vec2 vel; bool right,left, canMove; @@ -39,9 +40,9 @@ public: }; class Structures : public Entity{ public: - World *inside; + void *inside; Structures(); - unsigned int spawn(int, float, float); + unsigned int spawn(_TYPE, float, float); }; #endif // ENTITIES_H diff --git a/include/ui.h b/include/ui.h index 8341a8c..dbcee35 100644 --- a/include/ui.h +++ b/include/ui.h @@ -7,6 +7,8 @@ namespace ui { // Functions are kept in a namespace simply // for organization + extern vec2 mouse; + extern bool debug; extern unsigned int fontSize; |