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

This time really fixed compile errors

dev-time-step
krzys-h 2016-04-08 21:18:45 +02:00
parent ed58e7e012
commit 3e4fbe93a6
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/level/robotmain.cpp
View File

@ -5057,7 +5057,8 @@ Error CRobotMain::ProcessEndMissionTakeForGroup(std::vector<CSceneEndCondition*>
} }
//! Process EndMissionTake commands, result is stored in m_missionResult //! Process EndMissionTake commands, result is stored in m_missionResult
void CRobotMain::ProcessEndMissionTake() //! If return value is different than ERR_MISSION_NOTERM, assume the mission is finished and pass on the result
Error CRobotMain::ProcessEndMissionTake()
{ {
// Sort end conditions by teams // Sort end conditions by teams
std::map<int, std::vector<CSceneEndCondition*>> teams; std::map<int, std::vector<CSceneEndCondition*>> teams;
@ -5141,13 +5142,19 @@ void CRobotMain::ProcessEndMissionTake()
} }
} }
} }
return ERR_MISSION_NOTERM;
} }
//! Checks if the mission is over //! Checks if the mission is over
Error CRobotMain::CheckEndMission(bool frame) Error CRobotMain::CheckEndMission(bool frame)
{ {
// Process EndMissionTake, unless we are using LevelController script for processing ending conditions // Process EndMissionTake, unless we are using LevelController script for processing ending conditions
if (!m_missionResultFromScript) ProcessEndMissionTake(); if (!m_missionResultFromScript)
{
Error result = ProcessEndMissionTake();
if (result != ERR_MISSION_NOTERM) return result;
}
// Take action depending on m_missionResult // Take action depending on m_missionResult

2
src/level/robotmain.h
View File

@ -197,7 +197,7 @@ public:
void UpdateAudio(bool frame); void UpdateAudio(bool frame);
void SetMissionResultFromScript(Error result, float delay); void SetMissionResultFromScript(Error result, float delay);
Error CheckEndMission(bool frame); Error CheckEndMission(bool frame);
void ProcessEndMissionTake(); Error ProcessEndMissionTake();
Error ProcessEndMissionTakeForGroup(std::vector<CSceneEndCondition*>& endTakes); Error ProcessEndMissionTakeForGroup(std::vector<CSceneEndCondition*>& endTakes);
int GetObligatoryToken(); int GetObligatoryToken();
char* GetObligatoryToken(int i); char* GetObligatoryToken(int i);