diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-10-07 00:46:46 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-10-07 00:46:46 +0200 |
| commit | 97f44035f1b3ebd2681236c23f14c4d3ea7f09ac (patch) | |
| tree | 6937ba54a2e43d5e42fcb1cb2950684b4ab3c3ac /src/object/brain.cpp | |
| parent | 70dae8796e96b309d95f220dfb083ed81261ceb6 (diff) | |
| download | colobot-97f44035f1b3ebd2681236c23f14c4d3ea7f09ac.tar.gz colobot-97f44035f1b3ebd2681236c23f14c4d3ea7f09ac.tar.bz2 colobot-97f44035f1b3ebd2681236c23f14c4d3ea7f09ac.zip | |
Changing and saving input bindings
Diffstat (limited to 'src/object/brain.cpp')
| -rw-r--r-- | src/object/brain.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/object/brain.cpp b/src/object/brain.cpp index 7b580d7..5403903 100644 --- a/src/object/brain.cpp +++ b/src/object/brain.cpp @@ -203,8 +203,8 @@ bool CBrain::EventProcess(const Event &event) action = EVENT_NULL; if ( event.type == EVENT_KEY_DOWN && - (event.key.key == m_main->GetInputBinding(INPUT_SLOT_ACTION).key || - event.key.key == m_main->GetInputBinding(INPUT_SLOT_ACTION).joy ) && + (event.key.key == m_main->GetInputBinding(INPUT_SLOT_ACTION).primary || + event.key.key == m_main->GetInputBinding(INPUT_SLOT_ACTION).secondary ) && !m_main->GetEditLock() ) { pw = static_cast< Ui::CWindow* >(m_interface->SearchControl(EVENT_WINDOW0)); |