diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2016-01-07 08:37:49 -0500 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-01-07 08:37:49 -0500 |
| commit | 81cf23371b94baf608c98d0dd248acfbbd5d2c70 (patch) | |
| tree | 42282b56ce04e17fcc3f61d6b356b6ac72250915 /src/inventory.cpp | |
| parent | cdd792bc8ba7337e7bd3a9d0b4141c63f17fb9a8 (diff) | |
| parent | e043a2432c4dacce56a308948188482fb230ff33 (diff) | |
merge
Diffstat (limited to 'src/inventory.cpp')
| -rw-r--r-- | src/inventory.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp index c0f4163..b6819d1 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -291,7 +291,8 @@ void itemDraw(Player *p,ITEM_ID id,ITEM_TYPE type){ default: hangle = 0.0f; } - + glUseProgram(shaderProgram); + glUniform1i(glGetUniformLocation(shaderProgram, "sampler"), 0); glTranslatef(itemLoc.x,itemLoc.y,0); glRotatef(hangle, 0.0f, 0.0f, 1.0f); glTranslatef(-itemLoc.x,-itemLoc.y,0); @@ -307,6 +308,7 @@ void itemDraw(Player *p,ITEM_ID id,ITEM_TYPE type){ glDisable(GL_TEXTURE_2D); glTranslatef(player->loc.x*2,0,0); glPopMatrix(); + glUseProgram(0); } int Inventory::useItem(void){ |