From ec5a06754164bb2f77d3627990f896c040fc1c76 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 30 Jan 2014 22:10:01 +0300 Subject: Combine "Mod" and "Stop attack" keys. Remove old "Mod" key because it conflicting with "Stop attack" --- src/input/keyboarddata.h | 4 ++-- src/input/keydata.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/input') 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, -- cgit v1.2.3-70-g09d2