Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4445 in orxonox.OLD for orxonox


Ignore:
Timestamp:
Jun 1, 2005, 10:30:26 PM (19 years ago)
Author:
patrick
Message:

orxonox/trunk: cleaned up the orxonox class: removed all unused variables and functions

Location:
orxonox/trunk/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/class_list.h

    r4367 r4445  
    1313typedef enum classList
    1414{
     15  CL_ORXONOX,
     16
    1517  CL_PARENT,
    1618  CL_HELPER_PARENT,

  • orxonox/trunk/src/orxonox.cc

    r4442 r4445  
    5454Orxonox::Orxonox ()
    5555{
    56   this->pause = false;
    57 
    58   this->world = NULL;
     56  this->setClassID(CL_ORXONOX, "Orxonox");
     57
    5958  this->resourceManager = NULL;
    6059  this->objectManager = NULL;
    … …  
    7271  int i =0;
    7372  Orxonox::singletonRef = NULL;
    74   if( world != NULL) delete world;
    7573  delete GraphicsEngine::getInstance(); // deleting the Graphics
    7674  delete ResourceManager::getInstance(); // deletes the Resource Manager
    7775  delete ObjectManager::getInstance();
    7876  delete TextEngine::getInstance();
     77  delete EventHandler::getInstance();
    7978}
    8079
    … …  
    236235
    237236
    238 /**
    239    \brief initializes the world
    240 */
    241 int Orxonox::initWorld()
    242 {
    243   //world = new World();
    244  
    245   // TO DO: replace this with a menu/intro
    246   //world->load_debug_level();
    247  
    248   return 0;
    249 }
    250237
    251238
    … …  
    296283 
    297284
    298 
     285/**
     286  \brief processes the events for orxonox main class
     287  \param the event to handle
     288*/
    299289void Orxonox::process(const Event &event)
    300290{}
    301291
    302 
    303 
    304 /**
    305    \brief retrieve a pointer to the local World
    306    \return a pointer to world
    307 */
    308 World* Orxonox::getWorld()
    309 {
    310   return world;
    311 }
    312 
    313 /**
    314    \return The reference of the SDL-screen of orxonox
    315 */
    316 SDL_Surface* Orxonox::getScreen ()
    317 {
    318   return this->screen;
    319 }
    320292
    321293

  • orxonox/trunk/src/orxonox.h

    r4442 r4445  
    77#define _ORXONOX_H
    88
    9 #include "comincl.h"
    109#include "glincl.h"
    1110#include "event_listener.h"
     11
    1212
    1313
    … …  
    2626class Orxonox : public EventListener {
    2727
     28
     29 public:
     30  static Orxonox* getInstance ();
     31  virtual ~Orxonox ();
     32  int init (int argc, char** argv);
     33
     34  void start();
     35  void quitGame();
     36
     37  void graphicsHandler (SDL_Event* event);
     38  void process(const Event  &event);
     39
     40 private:
     41  int initVideo ();
     42  int initSound ();
     43  int initInput ();
     44  int initNetworking ();
     45  int initResources ();
     46
    2847 private:
    2948  static Orxonox* singletonRef;
    … …  
    3150
    3251  char configfilename[256];   //!< Filename of the configuration-file.
    33   World* world;               //!< Reference to the current running world.
    34   SDL_Surface* screen;        //!< The current Screen
    3552  GameLoader* gameLoader;     //!< The gameLoader
    3653  ResourceManager* resourceManager; //!< The ResourceManager
    … …  
    4663 
    4764  void getConfigFile (int argc, char** argv);
    48  
    49   // subsystem initialization
    50   int initVideo ();
    51   int initSound ();
    52   int initInput ();
    53   int initNetworking ();
    54   int initResources ();
    55   int initWorld ();
    56  
    57  public:
    58   static Orxonox* getInstance ();
    59   virtual ~Orxonox ();
    6065
    61   void start();
    62   void quitGame();
    63 
    64   void graphicsHandler (SDL_Event* event);
    65   void process(const Event  &event);
    66 
    67   int init (int argc, char** argv);
    6866 
    6967
    70   World* getWorld();
    71   SDL_Surface* getScreen ();
    72  
    73   //void mainLoop();
    7468};
    7569

  • orxonox/trunk/src/util/loading/game_loader.cc

    r4443 r4445  
    3636GameLoader* GameLoader::singletonRef = 0;
    3737
    38 /*
     38/**
    3939  \brief simple constructor
    4040 */
    … …  
    4545
    4646
    47 /*
     47/**
    4848  \brief simple deconstructor
    4949 */
Note: See TracChangeset for help on using the changeset viewer.