diff options
| author | krzys-h <krzys_h@interia.pl> | 2013-03-27 22:20:50 +0100 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2013-03-27 22:20:50 +0100 |
| commit | 8659fb984f4fe5495d5a3ddbeeb7bd592f0c4a4c (patch) | |
| tree | e45b78aa2e7ea8d811ef9b4ceb95803e23d8552c | |
| parent | c6d89f6210d8525d12cefadbe2335779800143f3 (diff) | |
| download | colobot-8659fb984f4fe5495d5a3ddbeeb7bd592f0c4a4c.tar.gz colobot-8659fb984f4fe5495d5a3ddbeeb7bd592f0c4a4c.tar.bz2 colobot-8659fb984f4fe5495d5a3ddbeeb7bd592f0c4a4c.zip | |
Added option to lock SatCom
| -rw-r--r-- | src/object/robotmain.cpp | 5 | ||||
| -rw-r--r-- | src/object/robotmain.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index 9afbe4a..2df0719 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -659,6 +659,7 @@ CRobotMain::CRobotMain(CApplication* app) m_retroStyle = false; m_immediatSatCom = false; m_beginSatCom = false; + m_lockedSatCom = false; m_movieLock = false; m_satComLock = false; m_editLock = false; @@ -2027,7 +2028,7 @@ void CRobotMain::FlushDisplayInfo() //! index: SATCOM_* void CRobotMain::StartDisplayInfo(int index, bool movie) { - if (m_cmdEdit || m_satComLock) return; + if (m_cmdEdit || m_satComLock || m_lockedSatCom) return; CObject* obj = GetSelect(); 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->SetEnable(true); m_immediatSatCom = false; + m_lockedSatCom = false; m_endingWinRank = 0; m_endingLostRank = 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()); m_immediatSatCom = OpInt(line, "immediat", 0); + if(m_version >= 2) m_beginSatCom = m_lockedSatCom = OpInt(line, "lock", 0); } if (Cmd(line, "Satellite") && !resetObject) diff --git a/src/object/robotmain.h b/src/object/robotmain.h index 0bcd2dc..fe5fbd5 100644 --- a/src/object/robotmain.h +++ b/src/object/robotmain.h @@ -459,6 +459,7 @@ protected: bool m_retroStyle; // Retro bool m_immediatSatCom; // SatCom immediately? bool m_beginSatCom; // messages SatCom poster? + bool m_lockedSatCom; // SatCom locked? bool m_movieLock; // movie in progress? bool m_satComLock; // call of SatCom is possible? bool m_editLock; // edition in progress? |