From fe44e617a89e03bc8dba18f61e53c9d754b7a13a Mon Sep 17 00:00:00 2001 From: krzys-h Date: Tue, 25 Aug 2015 16:57:10 +0200 Subject: [PATCH] Fixed selection markers not disappearing when moving gun away --- src/level/robotmain.cpp | 7 ------- src/level/robotmain.h | 1 - src/ui/controls/target.cpp | 1 - 3 files changed, 9 deletions(-) diff --git a/src/level/robotmain.cpp b/src/level/robotmain.cpp index c5825f6a..9be80d47 100644 --- a/src/level/robotmain.cpp +++ b/src/level/robotmain.cpp @@ -717,18 +717,11 @@ bool CRobotMain::ProcessEvent(Event &event) if (event.type == EVENT_SPEED) SetSpeed(1.0f); - if (event.type == EVENT_MOUSE_MOVE) - { - m_lastMousePos = event.mousePos; - HiliteObject(event.mousePos); - } - if (!m_displayText->EventProcess(event)) return false; if (event.type == EVENT_MOUSE_MOVE) { - m_lastMousePos = event.mousePos; HiliteObject(event.mousePos); } diff --git a/src/level/robotmain.h b/src/level/robotmain.h index 3a183e20..13814c45 100644 --- a/src/level/robotmain.h +++ b/src/level/robotmain.h @@ -464,7 +464,6 @@ protected: float m_lostDelay = 0.0f; bool m_fixScene = false; // scene fixed, no interraction CObject* m_base = nullptr; // OBJECT_BASE exists in mission - Math::Point m_lastMousePos; CObject* m_selectObject = nullptr; Phase m_phase = PHASE_WELCOME1; diff --git a/src/ui/controls/target.cpp b/src/ui/controls/target.cpp index 3cadb12b..2c4d33a8 100644 --- a/src/ui/controls/target.cpp +++ b/src/ui/controls/target.cpp @@ -76,7 +76,6 @@ bool CTarget::EventProcess(const Event &event) m_engine->SetMouseType(Gfx::ENG_MOUSE_TARGET); m_event->AddEvent(Event(m_eventType)); - return false; } else {