Changeset 8051 for code/branches/tutorial/src/orxonox/gamestates/GSRoot.h
- Timestamp:
- Mar 9, 2011, 11:27:05 AM (13 years ago)
- Location:
- code/branches/tutorial
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/tutorial
- Property svn:mergeinfo changed
/code/branches/usability merged: 8018-8041
- Property svn:mergeinfo changed
-
code/branches/tutorial/src/orxonox/gamestates/GSRoot.h
r7935 r8051 54 54 void pause(); 55 55 56 static void delayedStartMainMenu(void); 57 56 58 protected: 57 59 virtual void changedTimeFactor(float factor_new, float factor_old); … … 60 62 bool bPaused_; 61 63 float timeFactorPauseBackup_; 64 static bool startMainMenu_s; 62 65 }; 63 66 }
Note: See TracChangeset
for help on using the changeset viewer.