Changeset 6105 for code/trunk/src/orxonox/gamestates/GSRoot.cc
- Timestamp:
- Nov 20, 2009, 4:55:40 PM (14 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/console (added) merged: 5941,5945,5968-5975,5983,5985-5986,5991-5992,5994-5996,5998,6000,6004-6007,6010-6017,6034,6037,6041,6043-6044,6089,6103-6104
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/gamestates/GSRoot.cc
r5929 r6105 90 90 void GSRoot::update(const Clock& time) 91 91 { 92 if (this->getActivity().topState)93 {94 // This state can not 'survive' on its own.95 // Load a user interface therefore96 Game::getInstance().requestState("ioConsole");97 }98 99 92 for (ObjectList<Timer>::iterator it = ObjectList<Timer>::begin(); it; ) 100 93 (it++)->tick(time);
Note: See TracChangeset
for help on using the changeset viewer.