[colobot] 57/145: Fix compile warning
Didier Raboud
odyx at moszumanska.debian.org
Mon Jul 11 12:56:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch debian/master
in repository colobot.
commit ed58e7e012b61d1b24c445ab058080afd786ca4d
Author: krzys-h <krzys_h at interia.pl>
Date: Fri Apr 8 21:16:03 2016 +0200
Fix compile warning
---
src/level/robotmain.cpp | 3 ++-
src/level/robotmain.h | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/level/robotmain.cpp b/src/level/robotmain.cpp
index b3c34de..848804f 100644
--- a/src/level/robotmain.cpp
+++ b/src/level/robotmain.cpp
@@ -5056,7 +5056,8 @@ Error CRobotMain::ProcessEndMissionTakeForGroup(std::vector<CSceneEndCondition*>
return finalResult;
}
-Error CRobotMain::ProcessEndMissionTake()
+//! Process EndMissionTake commands, result is stored in m_missionResult
+void CRobotMain::ProcessEndMissionTake()
{
// Sort end conditions by teams
std::map<int, std::vector<CSceneEndCondition*>> teams;
diff --git a/src/level/robotmain.h b/src/level/robotmain.h
index 4f78df3..d3294b3 100644
--- a/src/level/robotmain.h
+++ b/src/level/robotmain.h
@@ -197,7 +197,7 @@ public:
void UpdateAudio(bool frame);
void SetMissionResultFromScript(Error result, float delay);
Error CheckEndMission(bool frame);
- Error ProcessEndMissionTake();
+ void ProcessEndMissionTake();
Error ProcessEndMissionTakeForGroup(std::vector<CSceneEndCondition*>& endTakes);
int GetObligatoryToken();
char* GetObligatoryToken(int i);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git
More information about the Pkg-games-commits
mailing list