diff options
Diffstat (limited to 'src/object/brain.cpp')
-rw-r--r-- | src/object/brain.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/object/brain.cpp b/src/object/brain.cpp index 3f2dcb2..c395c6a 100644 --- a/src/object/brain.cpp +++ b/src/object/brain.cpp @@ -202,12 +202,9 @@ bool CBrain::EventProcess(const Event &event) action = EVENT_NULL; - CApplication* app = CApplication::GetInstancePointer(); - if ( event.type == EVENT_KEY_DOWN && - (event.key.key == app->GetInputBinding(INPUT_SLOT_ACTION).key - /* TODO joystick input binding - event.param == app->GetInputBinding(INPUT_SLOT_ACTION).joy*/ ) && + (event.key.key == m_main->GetInputBinding(INPUT_SLOT_ACTION).key || + event.key.key == m_main->GetInputBinding(INPUT_SLOT_ACTION).joy ) && !m_main->GetEditLock() ) { pw = static_cast< Ui::CWindow* >(m_interface->SearchControl(EVENT_WINDOW0)); |