Changeset 11071 for code/trunk/src/modules/mini4dgame/Mini4Dgame.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/modules/mini4dgame/Mini4Dgame.h
r10230 r11071 41 41 namespace orxonox 42 42 { 43 44 namespace mini4DgamePlayerColor45 {46 enum color47 {48 none,49 red,50 blue,51 green52 };53 }54 55 43 /** 56 44 @brief … … 65 53 virtual ~Mini4Dgame(); //!< Destructor. Cleans up, if initialized. 66 54 67 virtual void start(void) ; //!< Starts the Mini4Dgame minigame.68 virtual void end(void) ; ///!< Ends the Mini4Dgame minigame.55 virtual void start(void) override; //!< Starts the Mini4Dgame minigame. 56 virtual void end(void) override; ///!< Ends the Mini4Dgame minigame. 69 57 70 virtual void spawnPlayer(PlayerInfo* player) ; //!< Spawns the input player.58 virtual void spawnPlayer(PlayerInfo* player) override; //!< Spawns the input player. 71 59 72 60 void setGameboard(Mini4DgameBoard* board) … … 84 72 85 73 protected: 86 virtual void spawnPlayersIfRequested() ; //!< Spawns player.74 virtual void spawnPlayersIfRequested() override; //!< Spawns player. 87 75 88 76
Note: See TracChangeset
for help on using the changeset viewer.