Changeset 3280 for code/trunk/src/orxonox/gamestates/GSRoot.h
- Timestamp:
- Jul 12, 2009, 11:58:01 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core4 (added) merged: 3235-3237,3245-3250,3253-3254,3260-3261,3265,3270
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/gamestates/GSRoot.h
r3196 r3280 38 38 { 39 39 public: 40 GSRoot(const std::string& name, bool countTickTime);40 GSRoot(const GameStateConstrParams& params); 41 41 ~GSRoot(); 42 42 … … 52 52 53 53 private: 54 float timeFactor_; //!< A factor that sets the gamespeed. 1 is normal.54 float timeFactor_; //!< A factor that sets the gamespeed. 1 is normal. 55 55 bool bPaused_; 56 56 float timeFactorPauseBackup_; 57 58 LevelManager* levelManager_; //!< global level manager 57 59 58 60 // console commands
Note: See TracChangeset
for help on using the changeset viewer.