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

Added option to lock SatCom

dev-ui
krzys-h 2013-03-27 22:20:50 +01:00
parent c6d89f6210
commit 8659fb984f
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/object/robotmain.cpp
View File

@ -659,6 +659,7 @@ CRobotMain::CRobotMain(CApplication* app)
m_retroStyle = false; m_retroStyle = false;
m_immediatSatCom = false; m_immediatSatCom = false;
m_beginSatCom = false; m_beginSatCom = false;
m_lockedSatCom = false;
m_movieLock = false; m_movieLock = false;
m_satComLock = false; m_satComLock = false;
m_editLock = false; m_editLock = false;
@ -2027,7 +2028,7 @@ void CRobotMain::FlushDisplayInfo()
//! index: SATCOM_* //! index: SATCOM_*
void CRobotMain::StartDisplayInfo(int index, bool movie) void CRobotMain::StartDisplayInfo(int index, bool movie)
{ {
if (m_cmdEdit || m_satComLock) return; if (m_cmdEdit || m_satComLock || m_lockedSatCom) return;
CObject* obj = GetSelect(); CObject* obj = GetSelect();
bool human = obj != nullptr && obj->GetType() == OBJECT_HUMAN; bool human = obj != nullptr && obj->GetType() == OBJECT_HUMAN;
@ -3789,6 +3790,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
m_displayText->SetDelay(1.0f); m_displayText->SetDelay(1.0f);
m_displayText->SetEnable(true); m_displayText->SetEnable(true);
m_immediatSatCom = false; m_immediatSatCom = false;
m_lockedSatCom = false;
m_endingWinRank = 0; m_endingWinRank = 0;
m_endingLostRank = 0; m_endingLostRank = 0;
m_endTakeTotal = 0; m_endTakeTotal = 0;
@ -3908,6 +3910,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
strcpy(m_infoFilename[SATCOM_HUSTON], path.c_str()); strcpy(m_infoFilename[SATCOM_HUSTON], path.c_str());
m_immediatSatCom = OpInt(line, "immediat", 0); m_immediatSatCom = OpInt(line, "immediat", 0);
if(m_version >= 2) m_beginSatCom = m_lockedSatCom = OpInt(line, "lock", 0);
} }
if (Cmd(line, "Satellite") && !resetObject) if (Cmd(line, "Satellite") && !resetObject)

1
src/object/robotmain.h
View File

@ -459,6 +459,7 @@ protected:
bool m_retroStyle; // Retro bool m_retroStyle; // Retro
bool m_immediatSatCom; // SatCom immediately? bool m_immediatSatCom; // SatCom immediately?
bool m_beginSatCom; // messages SatCom poster? bool m_beginSatCom; // messages SatCom poster?
bool m_lockedSatCom; // SatCom locked?
bool m_movieLock; // movie in progress? bool m_movieLock; // movie in progress?
bool m_satComLock; // call of SatCom is possible? bool m_satComLock; // call of SatCom is possible?
bool m_editLock; // edition in progress? bool m_editLock; // edition in progress?