diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-19 18:32:18 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-19 18:32:18 +0200 |
| commit | 51884cef8e015bccbe1fa96dc56dc2f32439ccc5 (patch) | |
| tree | 53974a01650d52101c96dd11da5e2235c61a02d6 /src/ui/studio.cpp | |
| parent | 4a639cf543c15d45a37674d7eadaf09c23c2203d (diff) | |
| download | colobot-51884cef8e015bccbe1fa96dc56dc2f32439ccc5.tar.gz colobot-51884cef8e015bccbe1fa96dc56dc2f32439ccc5.tar.bz2 colobot-51884cef8e015bccbe1fa96dc56dc2f32439ccc5.zip | |
Input bindings rewrite
- moved input bindings to CRobotMain
- added virtual keymod and joystick button key presses
- fixed putenv error; other minor fixes
Diffstat (limited to 'src/ui/studio.cpp')
| -rw-r--r-- | src/ui/studio.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ui/studio.cpp b/src/ui/studio.cpp index 809ed0c..c546c57 100644 --- a/src/ui/studio.cpp +++ b/src/ui/studio.cpp @@ -241,8 +241,8 @@ bool CStudio::EventProcess(const Event &event) if ( event.type == EVENT_KEY_DOWN ) { - if ( event.key.key == m_app->GetInputBinding(INPUT_SLOT_CBOT).key // || - /*TODO event.param == m_app->GetKey(KEYRANK_CBOT, 1)*/ ) + if ( event.key.key == m_main->GetInputBinding(INPUT_SLOT_CBOT).key || + event.param == m_main->GetInputBinding(INPUT_SLOT_CBOT).joy ) { if ( m_helpFilename.length() > 0 ) { |