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

Fixed objects being deselected if not clicked on any object

master
krzys-h 2015-09-09 20:32:56 +02:00
parent 060db9c069
commit 74cee19c09
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/level/robotmain.cpp
View File

@ -1820,10 +1820,10 @@ bool CRobotMain::SelectObject(CObject* obj, bool displayError)
if (m_movie->IsExist()) return false; if (m_movie->IsExist()) return false;
if (obj != nullptr && !IsSelectable(obj)) return false; if (obj != nullptr && !IsSelectable(obj)) return false;
CObject* prev = DeselectAll();
if (m_missionType == MISSION_CODE_BATTLE && m_codeBattleStarted) if (m_missionType == MISSION_CODE_BATTLE && m_codeBattleStarted)
{ {
DeselectAll();
// During code battles, only change camera // During code battles, only change camera
m_camera->SetControllingObject(obj); m_camera->SetControllingObject(obj);
if (obj != nullptr) if (obj != nullptr)
@ -1838,6 +1838,7 @@ bool CRobotMain::SelectObject(CObject* obj, bool displayError)
else else
{ {
if (obj == nullptr) return false; if (obj == nullptr) return false;
CObject* prev = DeselectAll();
if (prev != nullptr && prev != obj) if (prev != nullptr && prev != obj)
PushToSelectionHistory(prev); PushToSelectionHistory(prev);