aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/common.h7
-rw-r--r--include/entities.h1
2 files changed, 7 insertions, 1 deletions
diff --git a/include/common.h b/include/common.h
index d5f1456..e46cf86 100644
--- a/include/common.h
+++ b/include/common.h
@@ -22,6 +22,11 @@
#include <SDL2/SDL_mixer.h>
/*
+ * Include file headers
+*/
+#include <Texture.h>
+
+/*
* Create a basic 2-point structure for coordinate saving
*/
@@ -88,7 +93,7 @@ extern unsigned int deltaTime;
*
*/
-GLuint loadTexture(const char *fileName);
+//GLuint loadTexture(const char *fileName);
/*
* Prints a formatted debug message to the console, along with the callee's file and line
diff --git a/include/entities.h b/include/entities.h
index fab2ca5..f9fe842 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -57,6 +57,7 @@ public:
char* name;
GENDER gender;
GLuint texture[3]; //TODO: ADD TEXTURES
+ Texturec* tex;
void spawn(float, float);