diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-22 00:38:17 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-22 00:38:17 +0200 |
commit | 0ff419560d5a567afaa0294968cc1f5b5e6b597b (patch) | |
tree | 03edeac0b7850348b9b910e0d39dd88a477afd75 /src/ui/key.cpp | |
parent | 15ff1d512b9e103396144bec1cd8004ecf4f7f9c (diff) | |
download | colobot-0ff419560d5a567afaa0294968cc1f5b5e6b597b.tar.gz colobot-0ff419560d5a567afaa0294968cc1f5b5e6b597b.tar.bz2 colobot-0ff419560d5a567afaa0294968cc1f5b5e6b597b.zip |
Event fixes & refactoring
- added new state tracking to Event
- removed old fields from Event
- fixed some issues with Events and fps counter
Diffstat (limited to 'src/ui/key.cpp')
-rw-r--r-- | src/ui/key.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/ui/key.cpp b/src/ui/key.cpp index 2e627bd..26d99ac 100644 --- a/src/ui/key.cpp +++ b/src/ui/key.cpp @@ -82,8 +82,8 @@ bool CKey::EventProcess(const Event &event) CControl::EventProcess(event); if (event.type == EVENT_MOUSE_BUTTON_DOWN) { - if (event.mouseButton.button == 1) // left - m_bCatch = Detect(event.mouseButton.pos); + if (event.mouseButton.button == MOUSE_BUTTON_LEFT) // left + m_bCatch = Detect(event.mousePos); } if (event.type == EVENT_KEY_DOWN && m_bCatch) { @@ -92,12 +92,13 @@ bool CKey::EventProcess(const Event &event) if ( TestKey(event.key.key) ) { // impossible ? m_sound->Play(SOUND_TZOING); } else { + // TODO: test for virtual, joystick, etc. if ( event.key.key == m_key[0] || event.key.key == m_key[1] ) { m_key[0] = event.key.key; m_key[1] = 0; } else { m_key[1] = m_key[0]; - m_key[0] = event.param; + m_key[0] = event.key.key; } m_sound->Play(SOUND_CLICK); |