immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed selection markers not disappearing when moving gun away

master
krzys-h 2015-08-25 16:57:10 +02:00
parent 8b7bd663b9
commit fe44e617a8
3 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/level/robotmain.cpp
View File

@ -717,18 +717,11 @@ bool CRobotMain::ProcessEvent(Event &event)
if (event.type == EVENT_SPEED) if (event.type == EVENT_SPEED)
SetSpeed(1.0f); SetSpeed(1.0f);
if (event.type == EVENT_MOUSE_MOVE)
{
m_lastMousePos = event.mousePos;
HiliteObject(event.mousePos);
}
if (!m_displayText->EventProcess(event)) if (!m_displayText->EventProcess(event))
return false; return false;
if (event.type == EVENT_MOUSE_MOVE) if (event.type == EVENT_MOUSE_MOVE)
{ {
m_lastMousePos = event.mousePos;
HiliteObject(event.mousePos); HiliteObject(event.mousePos);
} }

1
src/level/robotmain.h
View File

@ -464,7 +464,6 @@ protected:
float m_lostDelay = 0.0f; float m_lostDelay = 0.0f;
bool m_fixScene = false; // scene fixed, no interraction bool m_fixScene = false; // scene fixed, no interraction
CObject* m_base = nullptr; // OBJECT_BASE exists in mission CObject* m_base = nullptr; // OBJECT_BASE exists in mission
Math::Point m_lastMousePos;
CObject* m_selectObject = nullptr; CObject* m_selectObject = nullptr;
Phase m_phase = PHASE_WELCOME1; Phase m_phase = PHASE_WELCOME1;

1
src/ui/controls/target.cpp
View File

@ -76,7 +76,6 @@ bool CTarget::EventProcess(const Event &event)
m_engine->SetMouseType(Gfx::ENG_MOUSE_TARGET); m_engine->SetMouseType(Gfx::ENG_MOUSE_TARGET);
m_event->AddEvent(Event(m_eventType)); m_event->AddEvent(Event(m_eventType));
return false;
} }
else else
{ {