diff options
author | Clyne Sullivan <tullivan99@gmail.com> | 2016-01-20 08:47:05 -0500 |
---|---|---|
committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-01-20 08:47:05 -0500 |
commit | d6469d0cafc03c468c5977ec345d08b3ccb6fd0a (patch) | |
tree | c9b21ddcae956cc9d419d4d56997063eb95fc5f4 /src/entities.cpp | |
parent | 1e6676c35ce4990981e8cda389ba39108437d66d (diff) | |
parent | c1774c591f7897c1cfa28e05fdb7c72e07890933 (diff) |
merge, particles
Diffstat (limited to 'src/entities.cpp')
-rw-r--r-- | src/entities.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/entities.cpp b/src/entities.cpp index faf415b..65085ae 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -22,6 +22,12 @@ std::string sTexLoc[] = { "assets/townhall.png", "assets/lampPost1.png", "assets/brazzier.png"}; +GLuint waterTex; + +void initEntity(){ + waterTex = Texture::loadTexture("assets/waterTex.png"); +} + void getRandomName(Entity *e){ unsigned int tempNum,max=0; char *bufs; |