diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2015-10-04 19:35:27 -0400 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2015-10-04 19:35:27 -0400 |
| commit | 63dc9b399db9faef611c31629e0265b954d74197 (patch) | |
| tree | 24da206125a30159d1f7b312ea114bfd9a9c14d6 /include | |
| parent | aa73352387af9efc77495ebdac6d19fb276dd75a (diff) | |
Added texture support and textures
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 2 | ||||
| -rw-r--r-- | include/entities.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/common.h b/include/common.h index 9f29fbb..b283ec8 100644 --- a/include/common.h +++ b/include/common.h @@ -41,6 +41,8 @@ enum GENDER{ template<typename T, size_t N> //this fuction returns the size of any array int eAmt(T (&)[N]){return N;} +GLuint loadTexture(const char *fileName); + extern bool gameRunning; extern unsigned int deltaTime; diff --git a/include/entities.h b/include/entities.h index b58d569..d4df811 100644 --- a/include/entities.h +++ b/include/entities.h @@ -30,7 +30,7 @@ public: char* name; GENDER gender; - unsigned int texture[]; //TODO: ADD TEXTURES + unsigned int texture; //TODO: ADD TEXTURES void spawn(float, float); |