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

Merge pull request #1139 from AbigailBuccaneer/clang-7 

Fix building under clang-7
1008-fix
krzys_h 2018-04-24 14:12:15 +02:00 committed by GitHub
parent 419c430f7e 5cec29f4e6
commit 289b6577d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/level/scene_conditions.h
View File

@ -85,7 +85,7 @@ protected:
* \class CSceneEndCondition * \class CSceneEndCondition
* \brief Scene end condition * \brief Scene end condition
*/ */
class CSceneEndCondition : public CSceneCondition class CSceneEndCondition final : public CSceneCondition
{ {
public: public:
int winTeam = 0; int winTeam = 0;
@ -109,7 +109,7 @@ public:
* \class CAudioChangeCondition * \class CAudioChangeCondition
* \brief Audio change condition * \brief Audio change condition
*/ */
class CAudioChangeCondition : public CSceneCondition class CAudioChangeCondition final : public CSceneCondition
{ {
public: public:
std::string music = ""; std::string music = "";

4
src/level/scoreboard.h
View File

@ -78,7 +78,7 @@ public:
* \brief Scoreboard rule for destroying other objects * \brief Scoreboard rule for destroying other objects
* \see CScoreboard::AddKillRule() * \see CScoreboard::AddKillRule()
*/ */
class CScoreboardKillRule : public CScoreboardRule, public CObjectCondition class CScoreboardKillRule final : public CScoreboardRule, public CObjectCondition
{ {
public: public:
//! Read from line in scene file //! Read from line in scene file
@ -90,7 +90,7 @@ public:
* \brief Scoreboard rule for EndMissionTake rewards * \brief Scoreboard rule for EndMissionTake rewards
* \see CScoreboard::AddEndTakeRule() * \see CScoreboard::AddEndTakeRule()
*/ */
class CScoreboardEndTakeRule : public CScoreboardRule class CScoreboardEndTakeRule final : public CScoreboardRule
{ {
public: public:
int team = 0; int team = 0;