Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 19, 2009, 4:59:30 PM (16 years ago)
Author:
rgrieder
Message:

Added new class: Game
It represents basic operation related to the running game like start and stop or managing the new GameStates.
And since only three lines were left in Main.cc I thought I could move that to the very beginning of 'Game'.

Location:
code/branches/gui/src/orxonox
Files:
2 added
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • code/branches/gui/src/orxonox/CMakeLists.txt

    r2801 r2805  
    2020SET_SOURCE_FILES(ORXONOX_SRC_FILES
    2121  CameraManager.cc
     22  Game.cc
    2223  GraphicsManager.cc
    2324  LevelManager.cc
    24   Main.cc
    2525  PawnManager.cc
    2626  PlayerManager.cc
  • code/branches/gui/src/orxonox/GraphicsManager.h

    r2801 r2805  
    3434 */
    3535
    36 #ifndef _GraphicsEngine_H__
    37 #define _GraphicsEngine_H__
     36#ifndef _GraphicsManager_H__
     37#define _GraphicsManager_H__
    3838
    3939#include "OrxonoxPrereqs.h"
     
    131131}
    132132
    133 #endif /* _GraphicsEngine_H__ */
     133#endif /* _GraphicsManager_H__ */
  • code/branches/gui/src/orxonox/gamestates/GSGraphics.cc

    r2801 r2805  
    7575        Core::setShowsGraphics(true);
    7676
    77         // initialise graphics engine. Doesn't load the render window yet!
     77        // initialise graphics manager. Doesn't load the render window yet!
    7878        this->graphicsManager_ = new GraphicsManager();
    7979        this->graphicsManager_->initialise();
  • code/branches/gui/src/orxonox/gamestates/GSRoot.cc

    r2800 r2805  
    8080        {
    8181            // 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 commands
    9082            FunctorMember01<GameStateBase, const std::string&>* functor = createFunctor(&GameStateBase::requestState);
    9183            functor->setObject(this);
     
    114106    {
    115107        // destroy console commands
    116         delete this->ccExit_;
    117108        delete this->ccSelectGameState_;
    118109
  • code/branches/gui/src/orxonox/gamestates/GSRoot.h

    r2799 r2805  
    5353        ~GSRoot();
    5454
    55         void exitGame()
    56         { requestState("root"); }
    57 
    5855        // this has to be public because proteced triggers a bug in msvc
    5956        // when taking the function address.
     
    9390
    9491        // console commands
    95         ConsoleCommand*       ccExit_;
    9692        ConsoleCommand*       ccSelectGameState_;
    9793        ConsoleCommand*       ccSetTimeFactor_;
Note: See TracChangeset for help on using the changeset viewer.