Changeset 5693 for code/trunk/src/orxonox/objects/gametypes/Gametype.h
- Timestamp:
- Aug 29, 2009, 10:19:38 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/libraries (added) merged: 5612-5613,5615-5619,5621-5623,5625-5640,5642-5643,5647-5649,5665-5666,5685-5687,5692
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/gametypes/Gametype.h
r3280 r5693 38 38 #include "core/BaseObject.h" 39 39 #include "core/Identifier.h" 40 #include " interfaces/Tickable.h"40 #include "tools/interfaces/Tickable.h" 41 41 #include "objects/infos/GametypeInfo.h" 42 42 … … 133 133 134 134 inline void startTimer() 135 { 135 { 136 136 this->time_ = this->timeLimit_; 137 137 this->timerIsActive_ = true;
Note: See TracChangeset
for help on using the changeset viewer.