diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-01-30 22:10:01 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-01-31 01:06:49 +0300 |
| commit | ec5a06754164bb2f77d3627990f896c040fc1c76 (patch) | |
| tree | cad8586f26675a80d7dae4c878a7436ac73feefd /src/input | |
| parent | 5015c59af9d28b3a3bbedfd54b3827dd96597efa (diff) | |
| download | plus-ec5a06754164bb2f77d3627990f896c040fc1c76.tar.gz plus-ec5a06754164bb2f77d3627990f896c040fc1c76.tar.bz2 plus-ec5a06754164bb2f77d3627990f896c040fc1c76.tar.xz plus-ec5a06754164bb2f77d3627990f896c040fc1c76.zip | |
Combine "Mod" and "Stop attack" keys.
Remove old "Mod" key because it conflicting with "Stop attack"
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/keyboarddata.h | 4 | ||||
| -rw-r--r-- | src/input/keydata.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/input/keyboarddata.h b/src/input/keyboarddata.h index da0d22fee..c250b759e 100644 --- a/src/input/keyboarddata.h +++ b/src/input/keyboarddata.h @@ -1811,9 +1811,9 @@ static const KeyData keyData[Input::KEY_TOTAL] = { Input::KEY_NO_VALUE, 50, COND_GAME | COND_VALIDSPEED | COND_EMODS}, {"keyMod", - INPUT_KEYBOARD, SDLK_LSHIFT, INPUT_UNKNOWN, Input::KEY_NO_VALUE, - Input::GRP_GUI, + INPUT_UNKNOWN, Input::KEY_NO_VALUE, + 0, nullptr, Input::KEY_NO_VALUE, 50, COND_DEFAULT}, diff --git a/src/input/keydata.h b/src/input/keydata.h index 52bc7f6be..a0fb8341b 100644 --- a/src/input/keydata.h +++ b/src/input/keydata.h @@ -319,7 +319,7 @@ namespace Input KEY_AWAY, KEY_RIGHT_CLICK, KEY_CAMERA, - KEY_MOD, + KEY_RESERVED1, KEY_GUI_UP, KEY_GUI_DOWN, KEY_GUI_LEFT, |