diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2016-06-08 08:47:31 -0400 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-06-08 08:47:31 -0400 |
| commit | 6882786999581e2280c870249ae448c744767e73 (patch) | |
| tree | 665eb129c395250e3f390d5e86ac8896ac636322 /src/mob.cpp | |
| parent | 7110a4ab054341c9f41972b06044853138f526a8 (diff) | |
| parent | a978ddfb98734514874231ed28d0395533afa25d (diff) | |
merge; lights, xmls
Diffstat (limited to 'src/mob.cpp')
| -rw-r--r-- | src/mob.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mob.cpp b/src/mob.cpp index 4cafa09..ed9fbf4 100644 --- a/src/mob.cpp +++ b/src/mob.cpp @@ -154,9 +154,9 @@ void Cat::onHit(unsigned int _health) bool Cat::bindTex(void) { - glActiveTexture(GL_TEXTURE0); + glActiveTexture(GL_TEXTURE0); tex(0); - return true; + return true; } void Cat::createFromXML(XMLElement *e, World *w=nullptr) |