summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-12-10 17:52:33 +0300
committerAndrei Karas <akaras@inbox.ru>2011-12-10 17:54:21 +0300
commit03c15cd2ca4587d8bb275df738a9841081cb12f3 (patch)
tree48f5aefc096725a803e74323e0e400baddd0baf4
parent39eef459c1134008086fdce273eac4767724ef68 (diff)
downloadmv-03c15cd2ca4587d8bb275df738a9841081cb12f3.tar.gz
mv-03c15cd2ca4587d8bb275df738a9841081cb12f3.tar.bz2
mv-03c15cd2ca4587d8bb275df738a9841081cb12f3.tar.xz
mv-03c15cd2ca4587d8bb275df738a9841081cb12f3.zip
Fix talk to npc key delay.
-rw-r--r--ChangeLog1
-rw-r--r--src/game.cpp3
2 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 02525e11d..561216655 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
fix: draw damage part on hp bar.
fix: recursive directory creation on windows.
fix: text colors in wood theme.
+fix: talk to npc key delay.
add: polish translation (Derpella).
add: server side online list (evol only).
add: copy any line from chat to clipboard.
diff --git a/src/game.cpp b/src/game.cpp
index 683ba418b..2937d6bb7 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1507,8 +1507,7 @@ void Game::handleMoveAndAttack(SDL_Event &event, bool wasDown)
}
// Talk to the nearest NPC if 't' pressed
- if (event.type == SDL_KEYDOWN &&
- keyboard.getKeyIndex(event.key.keysym.sym)
+ if (wasDown && keyboard.getKeyIndex(event.key.keysym.sym)
== KeyboardConfig::KEY_TALK &&
!keyboard.isKeyActive(keyboard.KEY_EMOTE))
{