Changeset 3033 for code/trunk/src/orxonox/objects/gametypes/Gametype.h
- Timestamp:
- May 23, 2009, 9:57:52 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/gametypes (added) merged: 2827,2903,2905-2906,2933-2936,2952,2954,2961,2970-2971,2978,2985-2986,3019-3020
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/gametypes/Gametype.h
r2890 r3033 128 128 { return this->players_.size(); } 129 129 130 virtual void addTime(float t); 131 virtual void removeTime(float t); 132 133 inline void startTimer() 134 { 135 this->time_ = this->timeLimit_; 136 this->timerIsActive_ = true; 137 } 138 139 inline void stopTimer() 140 { this->timerIsActive_ = false; } 141 142 inline float getTime() 143 { return this->time_; } 144 145 inline bool getTimerIsActive() 146 { return timerIsActive_; } 147 148 inline void setTimeLimit(float t) 149 { this->timeLimit_ = t; } 150 151 virtual void resetTimer(); 152 virtual void resetTimer(float t); 153 130 154 protected: 131 155 virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const; … … 134 158 virtual void checkStart(); 135 159 virtual void spawnPlayer(PlayerInfo* player); 160 virtual void spawnPlayerAsDefaultPawn(PlayerInfo* player); 136 161 virtual void spawnPlayersIfRequested(); 137 162 virtual void spawnDeadPlayersIfRequested(); … … 141 166 bool bAutoStart_; 142 167 bool bForceSpawn_; 168 169 float time_; 170 float timeLimit_; 171 bool timerIsActive_; 143 172 144 173 float initialStartCountdown_;
Note: See TracChangeset
for help on using the changeset viewer.