Changeset 11071 for code/trunk/src/orxonox/gametypes/UnderAttack.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/UnderAttack.h
r9941 r11071 43 43 44 44 void setConfigValues(); 45 v oid tick (float dt);45 virtual void tick (float dt) override; 46 46 void addDestroyer(Destroyer* destroyer); 47 47 inline Destroyer* getDestroyer() const 48 48 { return this->destroyer_; } 49 49 50 virtual bool allowPawnHit(Pawn* victim, Pawn* originator = 0);51 virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = 0);52 virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = 0);53 virtual void playerEntered(PlayerInfo* player) ;50 virtual bool allowPawnHit(Pawn* victim, Pawn* originator = nullptr) override; 51 virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr) override; 52 virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr) override; 53 virtual void playerEntered(PlayerInfo* player) override; 54 54 55 55 protected:
Note: See TracChangeset
for help on using the changeset viewer.