diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2015-10-05 07:31:54 -0400 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2015-10-05 07:31:54 -0400 |
| commit | 9c7af916fce7252ee0608be8c918b0378249c832 (patch) | |
| tree | 6ae05fa843fc550ba36677668b7f602df0219119 /include | |
| parent | 1e88bc916af1a76e4790bdfcac459bf7ee3e0d48 (diff) | |
| parent | e58c8920f5332678e4446a8c33bc74a716024010 (diff) | |
merge
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 e579355..eeb58e4 100644 --- a/include/entities.h +++ b/include/entities.h @@ -39,7 +39,7 @@ public: char* name; GENDER gender; - unsigned int texture[]; //TODO: ADD TEXTURES + unsigned int texture; //TODO: ADD TEXTURES void spawn(float, float); |