Changeset 11054 for code/branches/cpp11_v3/src/orxonox/gametypes/Mission.h
- Timestamp:
- Jan 10, 2016, 1:54:11 PM (8 years ago)
- Location:
- code/branches/cpp11_v3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v3
- Property svn:mergeinfo changed
-
code/branches/cpp11_v3/src/orxonox/gametypes/Mission.h
r9729 r11054 42 42 virtual ~Mission() {} 43 43 44 virtual void tick(float dt) ;44 virtual void tick(float dt) override; 45 45 46 virtual void start() ;47 virtual void end() ;46 virtual void start() override; 47 virtual void end() override; 48 48 virtual void setTeams(); 49 virtual void addBots(unsigned int amount) {} //<! overwrite function in order to bypass the addbots command49 virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command 50 50 inline void setLives(unsigned int amount) 51 51 {this->lives_ = amount;} … … 58 58 59 59 protected: 60 virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);60 virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr) override; 61 61 bool missionAccomplished_; //<! indicates if player successfully finsihed the mission; 62 62 int lives_; //<! amount of player's lives <-> nr. of retries
Note: See TracChangeset
for help on using the changeset viewer.