Changeset 11071 for code/trunk/src/orxonox/gametypes/Gametype.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/Gametype.h
r10624 r11071 45 45 namespace orxonox 46 46 { 47 namespace PlayerState 48 { 49 enum Value 50 { 51 Uninitialized, 52 Joined, 53 Alive, 54 Dead 55 }; 56 } 47 enum class PlayerState 48 { 49 Uninitialized, 50 Joined, 51 Alive, 52 Dead 53 }; 57 54 58 55 struct Player 59 56 { 60 57 PlayerInfo* info_; 61 PlayerState ::Valuestate_;58 PlayerState state_; 62 59 int frags_; 63 60 int killed_; … … 76 73 void setConfigValues(); 77 74 78 virtual void tick(float dt) ;75 virtual void tick(float dt) override; 79 76 80 77 inline const GametypeInfo* getGametypeInfo() const … … 96 93 virtual void playerScored(PlayerInfo* player, int score = 1); 97 94 98 virtual bool allowPawnHit(Pawn* victim, Pawn* originator = 0);99 virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = 0);100 virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = 0);101 102 virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);95 virtual bool allowPawnHit(Pawn* victim, Pawn* originator = nullptr); 96 virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr); 97 virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr); 98 99 virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr); 103 100 virtual void pawnPreSpawn(Pawn* pawn); 104 101 virtual void pawnPostSpawn(Pawn* pawn); … … 175 172 virtual void spawnDeadPlayersIfRequested(); 176 173 177 virtual GSLevelMementoState* exportMementoState() ;178 virtual void importMementoState(const std::vector<GSLevelMementoState*>& states) ;174 virtual GSLevelMementoState* exportMementoState() override; 175 virtual void importMementoState(const std::vector<GSLevelMementoState*>& states) override; 179 176 180 177 WeakPtr<GametypeInfo> gtinfo_;
Note: See TracChangeset
for help on using the changeset viewer.