diff options
author | Clyne Sullivan <tullivan99@gmail.com> | 2016-05-23 08:49:47 -0400 |
---|---|---|
committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-05-23 08:49:47 -0400 |
commit | 7dd64863c9ca613cf6969442f621849762b20115 (patch) | |
tree | f0f52393573f4640411b74901d85198955890c01 /src | |
parent | 052d00df28a4f5a90a846a0b8a66aea1eb2ab7d6 (diff) | |
parent | d0fc10be6199fefaa897d6451114c521515dfb83 (diff) |
stop
Diffstat (limited to 'src')
-rw-r--r-- | src/inventory.cpp | 2 | ||||
-rw-r--r-- | src/ui.cpp | 3 |
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]); @@ -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) |