diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2016-05-23 08:07:20 -0400 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-05-23 08:07:20 -0400 |
| commit | f6f6bf484081a3c0c877b35e522a5bfb3a12fdc7 (patch) | |
| tree | ee0349f8b0077644f7dcb9009dd8395559f36879 /src/inventory.cpp | |
| parent | 3d5820da8b91f676a6b5663ff19ccc68c30905ff (diff) | |
| parent | eff05df9465fbe052d028284143a6d3f69876476 (diff) | |
Merge branch 'master' of https://github.com/tcsullivan/gamedev
Diffstat (limited to 'src/inventory.cpp')
| -rw-r--r-- | src/inventory.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp index 9727dc0..a7c19da 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -665,13 +665,13 @@ void itemDraw(Player *p, Item *d) { itemTex[10] = 1.0; } - GLfloat itemCoords[] = {itemLoc.x, itemLoc.y, 1.0, - itemLoc.x+d->dim.x, itemLoc.y, 1.0, - itemLoc.x+d->dim.x, itemLoc.y+d->dim.y, 1.0, + GLfloat itemCoords[] = {itemLoc.x, itemLoc.y, p->z, + itemLoc.x+d->dim.x, itemLoc.y, p->z, + itemLoc.x+d->dim.x, itemLoc.y+d->dim.y, p->z, - itemLoc.x+d->dim.x, itemLoc.y+d->dim.y, 1.0, - itemLoc.x, itemLoc.y+d->dim.y, 1.0, - itemLoc.x, itemLoc.y, 1.0}; + itemLoc.x+d->dim.x, itemLoc.y+d->dim.y, p->z, + itemLoc.x, itemLoc.y+d->dim.y, p->z, + itemLoc.x, itemLoc.y, p->z}; glBindTexture(GL_TEXTURE_2D,d->tex->image[0]); |