aboutsummaryrefslogtreecommitdiffstats
path: root/src/inventory.cpp
diff options
context:
space:
mode:
authordrumsetmonkey <abelleisle@roadrunner.com>2016-05-20 07:33:54 -0400
committerdrumsetmonkey <abelleisle@roadrunner.com>2016-05-20 07:33:54 -0400
commit85f67fa4b91d05c0e02997a616caf743a4bd714e (patch)
treea01d54bfd4ce8f8b077e8bb61b0ac9ff839c5c2d /src/inventory.cpp
parent72941038ae15ed524e2a878d087d98bc97e946b4 (diff)
Basic particle stack overflow patch
Diffstat (limited to 'src/inventory.cpp')
-rw-r--r--src/inventory.cpp12
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]);