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

New code battle camera behavior

master
krzys-h 2015-09-06 19:59:26 +02:00
parent 51330dde5e
commit d36fcf4187
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/level/robotmain.cpp
View File

@ -1818,14 +1818,32 @@ bool CRobotMain::SelectObject(CObject* obj, bool displayError)
if (m_movieLock || m_editLock) return false; if (m_movieLock || m_editLock) return false;
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(); CObject* prev = DeselectAll();
if (prev != nullptr && prev != obj) if (m_missionType == MISSION_CODE_BATTLE && m_codeBattleStarted)
PushToSelectionHistory(prev); {
// During code battles, only change camera
if (obj != nullptr)
{
m_camera->SetControllingObject(obj);
m_camera->SetType(Gfx::CAM_TYPE_PLANE);
}
else
{
m_camera->SetType(Gfx::CAM_TYPE_FREE);
}
}
else
{
if (obj == nullptr) return false;
SelectOneObject(obj, displayError); if (prev != nullptr && prev != obj)
PushToSelectionHistory(prev);
SelectOneObject(obj, displayError);
}
m_short->UpdateShortcuts(); m_short->UpdateShortcuts();
return true; return true;
} }
@ -2627,6 +2645,11 @@ bool CRobotMain::EventFrame(const Event &event)
{ {
m_codeBattleStarted = true; m_codeBattleStarted = true;
DestroyCodeBattleInterface(); DestroyCodeBattleInterface();
// Deselect object, but keep camera attached to it
CObject* obj = DeselectAll();
SelectObject(obj, false); // this uses code battle selection mode already
m_eventQueue->AddEvent(Event(EVENT_UPDINTERFACE)); m_eventQueue->AddEvent(Event(EVENT_UPDINTERFACE));
} }
} }