summaryrefslogtreecommitdiff
path: root/src/keyboarddata.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-04-10 23:42:45 +0300
committerAndrei Karas <akaras@inbox.ru>2012-04-11 00:05:30 +0300
commit9be7d0ac1127477a5ff5ffb3fb3dd45487eec213 (patch)
tree47433ccb0c1f7e4c71dea85647a642079948ad67 /src/keyboarddata.h
parenta3475e987b0e642b2b9aa9c6cbf74762c6c77d23 (diff)
downloadmv-9be7d0ac1127477a5ff5ffb3fb3dd45487eec213.tar.gz
mv-9be7d0ac1127477a5ff5ffb3fb3dd45487eec213.tar.bz2
mv-9be7d0ac1127477a5ff5ffb3fb3dd45487eec213.tar.xz
mv-9be7d0ac1127477a5ff5ffb3fb3dd45487eec213.zip
Move untarget and stop attack actions to actionmanager from hardcoded place.
Diffstat (limited to 'src/keyboarddata.h')
-rw-r--r--src/keyboarddata.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/keyboarddata.h b/src/keyboarddata.h
index 5ea1daba3..d1b77f3ea 100644
--- a/src/keyboarddata.h
+++ b/src/keyboarddata.h
@@ -123,16 +123,16 @@ static KeyData const keyData[Input::KEY_TOTAL] = {
INPUT_KEYBOARD, SDLK_LSHIFT,
INPUT_JOYSTICK, 4,
Input::GRP_DEFAULT,
- nullptr,
+ &ActionManager::stopAttack,
Input::KEY_NO_VALUE, 50,
COND_GAME},
{"keyUnTarget",
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
Input::GRP_DEFAULT,
- nullptr,
+ &ActionManager::untarget,
Input::KEY_NO_VALUE, 50,
- COND_DEFAULT},
+ COND_GAME},
{"keyTargetClosest",
INPUT_KEYBOARD, SDLK_a,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,