aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authordrumsetmonkey <abelleisle@roadrunner.com>2016-05-23 08:40:53 -0400
committerdrumsetmonkey <abelleisle@roadrunner.com>2016-05-23 08:40:53 -0400
commitd0fc10be6199fefaa897d6451114c521515dfb83 (patch)
tree2075aaba2345f51cd6799ce89cd2a0d7d6e1fec1 /src
parenteff05df9465fbe052d028284143a6d3f69876476 (diff)
Something fixed
Diffstat (limited to 'src')
-rw-r--r--src/inventory.cpp2
-rw-r--r--src/ui.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp
index a7c19da..e235f51 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -462,7 +462,7 @@ void Inventory::draw(void) {
glUseProgram(textShader);
glBindTexture(GL_TEXTURE_2D, Texture::genColor(Color(0.0f, 0.0f, 0.0f, t >= 0 ? 255 * t : 0)));
drawRect(vec2(r.end.x-(itemWide/2), r.end.y-(itemWide/2)),
- vec2(r.end.x-(itemWide/2)+itemWide,r.end.y-(itemWide/2)+itemWide), -6.1);
+ vec2(r.end.x-(itemWide/2)+itemWide,r.end.y-(itemWide/2)+itemWide), -6.0);
if (!Items.empty() && a < numSlot && Items[a].second) {
glBindTexture(GL_TEXTURE_2D, Items[a].first->tex->image[0]);//itemtex[items[a].id]);
diff --git a/src/ui.cpp b/src/ui.cpp
index 6eca97d..7ae444c 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -1345,6 +1345,9 @@ EXIT:
case SDLK_F3:
debug ^= true;
break;
+ case SDLK_BACKSLASH:
+ dialogBoxExists = false;
+ break;
case SDLK_x:
m = currentWorld->getNearMob(*player);
if (m != nullptr)