From c8ec3f2020151543f2ebe61e94ea5d985927d20c Mon Sep 17 00:00:00 2001 From: krzys-h Date: Wed, 25 Dec 2013 19:43:11 +0100 Subject: Added "E" as a secondary action button As requested by @Emxx52 on IRC --- src/object/robotmain.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index ba6e1c4..22e8152 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -994,19 +994,20 @@ void CRobotMain::SetDefaultInputBindings() m_inputBindings[INPUT_SLOT_GUP ].primary = VIRTUAL_KMOD(SHIFT); m_inputBindings[INPUT_SLOT_GDOWN ].primary = VIRTUAL_KMOD(CTRL); m_inputBindings[INPUT_SLOT_CAMERA ].primary = KEY(SPACE); - m_inputBindings[INPUT_SLOT_CAMERA ].secondary = VIRTUAL_JOY(2); +// m_inputBindings[INPUT_SLOT_CAMERA ].secondary = VIRTUAL_JOY(2); m_inputBindings[INPUT_SLOT_DESEL ].primary = KEY(KP0); - m_inputBindings[INPUT_SLOT_DESEL ].secondary = VIRTUAL_JOY(6); +// m_inputBindings[INPUT_SLOT_DESEL ].secondary = VIRTUAL_JOY(6); m_inputBindings[INPUT_SLOT_ACTION ].primary = KEY(RETURN); - m_inputBindings[INPUT_SLOT_ACTION ].secondary = VIRTUAL_JOY(1); +// m_inputBindings[INPUT_SLOT_ACTION ].secondary = VIRTUAL_JOY(1); + m_inputBindings[INPUT_SLOT_ACTION ].secondary = KEY(e); m_inputBindings[INPUT_SLOT_NEAR ].primary = KEY(KP_PLUS); - m_inputBindings[INPUT_SLOT_NEAR ].secondary = VIRTUAL_JOY(5); +// m_inputBindings[INPUT_SLOT_NEAR ].secondary = VIRTUAL_JOY(5); m_inputBindings[INPUT_SLOT_AWAY ].primary = KEY(KP_MINUS); - m_inputBindings[INPUT_SLOT_AWAY ].secondary = VIRTUAL_JOY(4); +// m_inputBindings[INPUT_SLOT_AWAY ].secondary = VIRTUAL_JOY(4); m_inputBindings[INPUT_SLOT_NEXT ].primary = KEY(TAB); - m_inputBindings[INPUT_SLOT_NEXT ].secondary = VIRTUAL_JOY(3); +// m_inputBindings[INPUT_SLOT_NEXT ].secondary = VIRTUAL_JOY(3); m_inputBindings[INPUT_SLOT_HUMAN ].primary = KEY(HOME); - m_inputBindings[INPUT_SLOT_HUMAN ].secondary = VIRTUAL_JOY(7); +// m_inputBindings[INPUT_SLOT_HUMAN ].secondary = VIRTUAL_JOY(7); m_inputBindings[INPUT_SLOT_QUIT ].primary = KEY(ESCAPE); m_inputBindings[INPUT_SLOT_HELP ].primary = KEY(F1); m_inputBindings[INPUT_SLOT_PROG ].primary = KEY(F2); -- cgit v1.2.3-1-g7c22