Changeset 11054 for code/branches/cpp11_v3/src/orxonox/gamestates/GSRoot.h
- Timestamp:
- Jan 10, 2016, 1:54:11 PM (8 years ago)
- Location:
- code/branches/cpp11_v3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v3
- Property svn:mergeinfo changed
-
code/branches/cpp11_v3/src/orxonox/gamestates/GSRoot.h
r8706 r11054 44 44 static void printObjects(); 45 45 46 v oid activate();47 v oid deactivate();48 v oid update(const Clock& time);46 virtual void activate() override; 47 virtual void deactivate() override; 48 virtual void update(const Clock& time) override; 49 49 50 50 // this has to be public because proteced triggers a bug in msvc … … 59 59 60 60 protected: 61 virtual void changedTimeFactor(float factor_new, float factor_old) ;61 virtual void changedTimeFactor(float factor_new, float factor_old) override; 62 62 63 63 private:
Note: See TracChangeset
for help on using the changeset viewer.