diff options
author | drumsetmonkey <abelleisle@roadrunner.com> | 2015-10-22 09:23:08 -0400 |
---|---|---|
committer | drumsetmonkey <abelleisle@roadrunner.com> | 2015-10-22 09:23:08 -0400 |
commit | c6739a753e31e8d239b662fbfc7d9ac7e7c0621e (patch) | |
tree | b481b819ef312f00567401adce4caab05127188d /include | |
parent | fd79887f68775b781ed7f00b98aea28f1d9caa4d (diff) |
Commented more of entities, added new texture namespace and class
Diffstat (limited to 'include')
-rw-r--r-- | include/common.h | 7 | ||||
-rw-r--r-- | include/entities.h | 1 |
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); |