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/target.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/target.cpp')
| -rw-r--r-- | src/ui/target.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/ui/target.cpp b/src/ui/target.cpp index f398e58..b47ba16 100644 --- a/src/ui/target.cpp +++ b/src/ui/target.cpp @@ -59,7 +59,7 @@ bool CTarget::EventProcess(const Event &event) if ( event.type == EVENT_MOUSE_MOVE ) { - if ( CControl::Detect(event.pos) ) + if ( CControl::Detect(event.mousePos) ) { m_engine->SetMouseType(Gfx::ENG_MOUSE_TARGET); Event newEvent = event; @@ -70,11 +70,11 @@ bool CTarget::EventProcess(const Event &event) } if ( event.type == EVENT_MOUSE_BUTTON_DOWN && - event.mouseButton.button == 1 && + event.mouseButton.button == MOUSE_BUTTON_LEFT && (m_state & STATE_VISIBLE) && (m_state & STATE_ENABLE) ) { - if ( CControl::Detect(event.pos) ) + if ( CControl::Detect(event.mousePos) ) { Event newEvent = event; newEvent.type = EVENT_OBJECT_FIRE; @@ -96,9 +96,9 @@ bool CTarget::EventProcess(const Event &event) { m_main->SetFriendAim(false); - if ( CControl::Detect(event.mouseMove.pos) ) + if ( CControl::Detect(event.mousePos) ) { - pObj = DetectFriendObject(event.mouseMove.pos); + pObj = DetectFriendObject(event.mousePos); if ( pObj == 0 ) { m_engine->SetMouseType(Gfx::ENG_MOUSE_TARGET); @@ -117,11 +117,11 @@ bool CTarget::EventProcess(const Event &event) } if ( event.type == EVENT_MOUSE_BUTTON_DOWN && - event.mouseButton.button == 1 && + event.mouseButton.button == MOUSE_BUTTON_LEFT && (m_state & STATE_VISIBLE) && (m_state & STATE_ENABLE) ) { - if ( CControl::Detect(event.mouseButton.pos) ) + if ( CControl::Detect(event.mousePos) ) { if ( !m_main->GetFriendAim() ) { |