summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-10-01 06:48:24 +0000
committerGuillaume Melquiond <guillaume.melquiond@gmail.com>2007-10-01 06:48:24 +0000
commit7df722ac2899729174c1a88bec96f658237023bf (patch)
tree886e282ee553bd9876ae5133f0ccae139cb146cf
parent3b79ce4edf01b19a9ca0d1cb75ce38da8384b41d (diff)
downloadMana-7df722ac2899729174c1a88bec96f658237023bf.tar.gz
Mana-7df722ac2899729174c1a88bec96f658237023bf.tar.bz2
Mana-7df722ac2899729174c1a88bec96f658237023bf.tar.xz
Mana-7df722ac2899729174c1a88bec96f658237023bf.zip
Fixed attacking with keyboard.
-rw-r--r--ChangeLog1
-rw-r--r--src/game.cpp7
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index cbc0ba93..d1d9530e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
* src/item.cpp, src/gui/itemcontainer.cpp, src/resources/itemdb.cpp:
Fixed inventory display so that empty slots are not unknown items.
Adjusted "type" meaning to tmwserv one.
+ * src/game.cpp: Fixed attacking with keyboard.
2007-09-25 Björn Steinbrink <B.Steinbrink@gmx.de>
diff --git a/src/game.cpp b/src/game.cpp
index 3e2a9deb..176d9642 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -550,11 +550,18 @@ void Game::handleInput()
used = true;
}
break;
+
+ case KeyboardConfig::KEY_ATTACK:
+ player_node->attack();
+ used = true;
+ break;
+
case KeyboardConfig::KEY_SIT:
// Player sit action
player_node->toggleSit();
used = true;
break;
+
case KeyboardConfig::KEY_HIDE_WINDOWS:
// Hide certain windows
if (!chatWindow->isFocused())