diff options
| author | krzys-h <krzys_h@interia.pl> | 2013-04-28 18:33:59 +0200 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2013-04-28 18:33:59 +0200 |
| commit | fc28a8e8406e4b5fd810a09ed3b9524af8d69482 (patch) | |
| tree | 54eb10f234c8deae6ac38a1fa230ce64eb054e90 /src/object/robotmain.cpp | |
| parent | cde8653e60daab8303aa45507ce0aa2fca0f2708 (diff) | |
| download | colobot-fc28a8e8406e4b5fd810a09ed3b9524af8d69482.tar.gz colobot-fc28a8e8406e4b5fd810a09ed3b9524af8d69482.tar.bz2 colobot-fc28a8e8406e4b5fd810a09ed3b9524af8d69482.zip | |
Implemented EndMissionNever (#181)
Diffstat (limited to 'src/object/robotmain.cpp')
| -rw-r--r-- | src/object/robotmain.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index 6ba09a5..7be1177 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -3830,6 +3830,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject) m_audioChangeTotal = 0; m_endTakeTotal = 0; m_endTakeResearch = 0; + m_endTakeNever = false; m_endTakeWinDelay = 2.0f; m_endTakeLostDelay = 2.0f; m_obligatoryTotal = 0; @@ -4703,6 +4704,10 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject) { m_endTakeResearch |= OpResearch(line, "type"); } + if (Cmd(line, "EndMissionNever") && !resetObject && m_version >= 2) + { + m_endTakeNever = true; + } if (Cmd(line, "ObligatoryToken") && !resetObject) { @@ -6763,7 +6768,8 @@ Error CRobotMain::CheckEndMission(bool frame) } } if (nb < m_endTake[t].min || - nb > m_endTake[t].max) + nb > m_endTake[t].max || + m_endTakeNever) { m_displayText->SetEnable(true); return ERR_MISSION_NOTERM; |