Changeset 11071 for code/trunk/src/orxonox/gametypes/TeamBaseMatch.h
- Timestamp:
- Jan 17, 2016, 10:29:21 PM (8 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/gametypes/TeamBaseMatch.h
r9667 r11071 44 44 virtual ~TeamBaseMatch() {} 45 45 46 virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = 0);47 virtual bool allowPawnDamage(Pawn* victim, Pawn* originator) ;46 virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr) override; 47 virtual bool allowPawnDamage(Pawn* victim, Pawn* originator) override; 48 48 49 virtual void playerScored(PlayerInfo* player, int score = 1) ;49 virtual void playerScored(PlayerInfo* player, int score = 1) override; 50 50 virtual void showPoints(); 51 51 virtual void endGame();
Note: See TracChangeset
for help on using the changeset viewer.