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

Fix compile warning

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

3
src/level/robotmain.cpp
View File

@ -5056,7 +5056,8 @@ Error CRobotMain::ProcessEndMissionTakeForGroup(std::vector<CSceneEndCondition*>
return finalResult; return finalResult;
} }
Error CRobotMain::ProcessEndMissionTake() //! Process EndMissionTake commands, result is stored in m_missionResult
void 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;

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);
Error ProcessEndMissionTake(); void 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);