aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/common.h10
-rw-r--r--include/entities.h2
2 files changed, 11 insertions, 1 deletions
diff --git a/include/common.h b/include/common.h
index 8410f58..5ffb2a1 100644
--- a/include/common.h
+++ b/include/common.h
@@ -12,7 +12,6 @@
#include <SDL2/SDL_opengl.h>
typedef struct { float x; float y; }vec2;
-typedef struct { char* first; char* last; }_name;
enum _TYPE { //these are the main types of entities
STRUCTURET = -1,
@@ -20,6 +19,12 @@ enum _TYPE { //these are the main types of entities
NPCT = 1
};
+enum GENDER{
+ MALE,
+ FEMALE,
+ NONE
+};
+
#include <entities.h>
#define SCREEN_WIDTH 1280
@@ -37,4 +42,7 @@ int eAmt(T (&)[N]){return N;}
extern bool gameRunning;
extern unsigned int deltaTime;
+extern FILE* config;
+extern FILE* names;
+
#endif // COMMON_H
diff --git a/include/entities.h b/include/entities.h
index 53a8057..77eaaab 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -24,10 +24,12 @@ public:
unsigned char ground; //variable for testing what ground the entity is on to apply certain traits
unsigned int texture[]; //TODO: ADD TEXTURES
+
void spawn(float, float);
void draw(void);
void wander(int, vec2*);
+ char* getName();
virtual void interact(){}
private:
int ticksToUse; //The variable for deciding how long an entity should do a certain task