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

Fixed EndMissionTake conditions (again)

master
krzys-h 2015-07-10 10:45:30 +02:00
parent d3c3a51ede
commit c63efeca46
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/object/robotmain.cpp
View File

@ -5437,10 +5437,20 @@ Error CRobotMain::CheckEndMissionForGroup(std::vector<CSceneEndCondition*>& endT
if (endTake->lost < 0) if (endTake->lost < 0)
hasWinningConditions = true; hasWinningConditions = true;
if (result != ERR_OK || endTake->immediat) if (result == ERR_OK && endTake->immediat)
{ {
if (finalResult != INFO_LOST && finalResult != INFO_LOSTq) hasWinningConditions = true;
finalResult = result; finalResult = result;
break;
}
if (result != ERR_OK)
{
finalResult = result;
if (finalResult == INFO_LOST || finalResult == INFO_LOSTq)
{
break;
}
} }
} }
if (finalResult == ERR_OK && !hasWinningConditions) finalResult = ERR_MISSION_NOTERM; if (finalResult == ERR_OK && !hasWinningConditions) finalResult = ERR_MISSION_NOTERM;
@ -5450,6 +5460,7 @@ Error CRobotMain::CheckEndMissionForGroup(std::vector<CSceneEndCondition*>& endT
//! Checks if the mission is over //! Checks if the mission is over
Error CRobotMain::CheckEndMission(bool frame) Error CRobotMain::CheckEndMission(bool frame)
{ {
bool isImmediat = false;
// Process EndMissionTake, unless we are using MissionController // Process EndMissionTake, unless we are using MissionController
if (m_controller == nullptr) if (m_controller == nullptr)
{ {
@ -5458,6 +5469,8 @@ Error CRobotMain::CheckEndMission(bool frame)
for (std::unique_ptr<CSceneEndCondition>& endTake : m_endTake) for (std::unique_ptr<CSceneEndCondition>& endTake : m_endTake)
{ {
teams[endTake->winTeam].push_back(endTake.get()); teams[endTake->winTeam].push_back(endTake.get());
if(endTake->immediat)
isImmediat = true;
} }
int teamCount = 0; int teamCount = 0;
@ -5584,7 +5597,7 @@ Error CRobotMain::CheckEndMission(bool frame)
return ERR_OK; // mission ended return ERR_OK; // mission ended
} }
if (frame && m_base != nullptr && m_base->GetSelectable()) return ERR_MISSION_NOTERM; if (frame && m_base != nullptr && m_base->GetSelectable() && !isImmediat) return ERR_MISSION_NOTERM;
if (m_winDelay == 0.0f) if (m_winDelay == 0.0f)
{ {