Changeset 2805 for code/branches/gui/src/orxonox/gamestates
- Timestamp:
- Mar 19, 2009, 4:59:30 PM (16 years ago)
- Location:
- code/branches/gui/src/orxonox/gamestates
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/gui/src/orxonox/gamestates/GSGraphics.cc
r2801 r2805 75 75 Core::setShowsGraphics(true); 76 76 77 // initialise graphics engine. Doesn't load the render window yet!77 // initialise graphics manager. Doesn't load the render window yet! 78 78 this->graphicsManager_ = new GraphicsManager(); 79 79 this->graphicsManager_->initialise(); -
code/branches/gui/src/orxonox/gamestates/GSRoot.cc
r2800 r2805 80 80 { 81 81 // add console commands 82 FunctorMember<GSRoot>* functor = createFunctor(&GSRoot::exitGame);83 functor->setObject(this);84 this->ccExit_ = createConsoleCommand(functor, "exit");85 CommandExecutor::addConsoleCommandShortcut(this->ccExit_);86 }87 88 {89 // add console commands90 82 FunctorMember01<GameStateBase, const std::string&>* functor = createFunctor(&GameStateBase::requestState); 91 83 functor->setObject(this); … … 114 106 { 115 107 // destroy console commands 116 delete this->ccExit_;117 108 delete this->ccSelectGameState_; 118 109 -
code/branches/gui/src/orxonox/gamestates/GSRoot.h
r2799 r2805 53 53 ~GSRoot(); 54 54 55 void exitGame()56 { requestState("root"); }57 58 55 // this has to be public because proteced triggers a bug in msvc 59 56 // when taking the function address. … … 93 90 94 91 // console commands 95 ConsoleCommand* ccExit_;96 92 ConsoleCommand* ccSelectGameState_; 97 93 ConsoleCommand* ccSetTimeFactor_;
Note: See TracChangeset
for help on using the changeset viewer.