diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-11-03 20:21:44 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-11-03 20:21:44 +0300 |
| commit | d9fd0f7fad79d8f285fe399322e81c48b02fb0b4 (patch) | |
| tree | 9ddcb4cec7b74c925a21fb8a58945aa02f0c006a /src/input | |
| parent | 9c3ba8303da72248d978696fc9363a2b47528b29 (diff) | |
| download | manaverse-d9fd0f7fad79d8f285fe399322e81c48b02fb0b4.tar.gz manaverse-d9fd0f7fad79d8f285fe399322e81c48b02fb0b4.tar.bz2 manaverse-d9fd0f7fad79d8f285fe399322e81c48b02fb0b4.tar.xz manaverse-d9fd0f7fad79d8f285fe399322e81c48b02fb0b4.zip | |
better not add new input actions in middle
because this broke already assigned values.
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/keyboarddata.h | 16 | ||||
| -rw-r--r-- | src/input/keydata.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/input/keyboarddata.h b/src/input/keyboarddata.h index ed8aefe17..42b8f9fc6 100644 --- a/src/input/keyboarddata.h +++ b/src/input/keyboarddata.h @@ -62,13 +62,6 @@ static const KeyData keyData[Input::KEY_TOTAL] = { &ActionManager::moveRight, Input::KEY_NO_VALUE, 50, COND_GAME}, - {"keyMoveForward", - INPUT_UNKNOWN, Input::KEY_NO_VALUE, - INPUT_UNKNOWN, Input::KEY_NO_VALUE, - Input::GRP_DEFAULT, - &ActionManager::moveForward, - Input::KEY_NO_VALUE, 50, - COND_GAME}, {"keyAttack", INPUT_KEYBOARD, SDLK_LCTRL, INPUT_UNKNOWN, Input::KEY_NO_VALUE, @@ -1974,7 +1967,14 @@ static const KeyData keyData[Input::KEY_TOTAL] = { Input::GRP_CHAT, nullptr, Input::KEY_NO_VALUE, 50, - COND_DEFAULT | COND_INGAME} + COND_DEFAULT | COND_INGAME}, + {"keyMoveForward", + INPUT_UNKNOWN, Input::KEY_NO_VALUE, + INPUT_UNKNOWN, Input::KEY_NO_VALUE, + Input::GRP_DEFAULT, + &ActionManager::moveForward, + Input::KEY_NO_VALUE, 50, + COND_GAME} }; #endif // INPUT_KEYBOARDDATA_H diff --git a/src/input/keydata.h b/src/input/keydata.h index 562c15208..aea8c9244 100644 --- a/src/input/keydata.h +++ b/src/input/keydata.h @@ -71,7 +71,6 @@ namespace Input KEY_MOVE_DOWN, KEY_MOVE_LEFT, KEY_MOVE_RIGHT, - KEY_MOVE_FORWARD, KEY_ATTACK, KEY_TARGET_ATTACK, KEY_MOVE_TO_TARGET, @@ -342,6 +341,7 @@ namespace Input KEY_SHOW_KEYBOARD, KEY_SHOW_WINDOWS, KEY_CHAT_MOD, + KEY_MOVE_FORWARD, KEY_TOTAL }; } // namespace Input |