- 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/Deathmatch.h
r9667 r11054 41 41 virtual ~Deathmatch() {} 42 42 43 virtual void start() ;44 virtual void end() ;45 virtual void playerEntered(PlayerInfo* player) ;46 virtual bool playerLeft(PlayerInfo* player) ;47 virtual bool playerChangedName(PlayerInfo* player) ;43 virtual void start() override; 44 virtual void end() override; 45 virtual void playerEntered(PlayerInfo* player) override; 46 virtual bool playerLeft(PlayerInfo* player) override; 47 virtual bool playerChangedName(PlayerInfo* player) override; 48 48 49 virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);50 virtual void playerScored(PlayerInfo* player, int score = 1) ;49 virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr) override; 50 virtual void playerScored(PlayerInfo* player, int score = 1) override; 51 51 }; 52 52 }
Note: See TracChangeset
for help on using the changeset viewer.