Changeset 9016 for code/trunk/src/orxonox/gametypes/Gametype.h
- Timestamp:
- Feb 15, 2012, 11:51:58 PM (12 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
r8706 r9016 123 123 { return this->gtinfo_->getHUDTemplate(); } 124 124 125 v oid addBots(unsigned int amount);125 virtual void addBots(unsigned int amount); 126 126 void killBots(unsigned int amount = 0); 127 128 inline unsigned int getNumberOfPlayers() const129 { return this->players_.size(); }130 127 131 128 virtual void addTime(float t); … … 151 148 152 149 //inline bool getForceSpawn() 153 // { return this->bForceSpawn_; } 150 // { return this->bForceSpawn_; } 154 151 155 152 virtual void resetTimer(); 156 153 virtual void resetTimer(float t); 154 inline unsigned int getNumberOfPlayers() 155 { return this->gtinfo_->getNumberOfPlayers(); } 156 157 157 158 158 159 protected: … … 192 193 ConsoleCommand* dedicatedKillBots_; 193 194 /* HACK HACK HACK */ 195 194 196 }; 195 197 }
Note: See TracChangeset
for help on using the changeset viewer.