Changeset 4445 in orxonox.OLD for orxonox/trunk/src/orxonox.h

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

File:

• orxonox/trunk/src/orxonox.h (modified) (4 diffs)

orxonox/trunk/src/orxonox.h

@@ -7 +7 @@
 #define _ORXONOX_H
 
-#include "comincl.h"
 #include "glincl.h"
 #include "event_listener.h"
+
 
 
@@ -26 +26 @@
 class Orxonox : public EventListener {
 
+
+ public:
+  static Orxonox* getInstance ();
+  virtual ~Orxonox ();
+  int init (int argc, char** argv);
+
+  void start();
+  void quitGame();
+
+  void graphicsHandler (SDL_Event* event);
+  void process(const Event  &event);
+
+ private:
+  int initVideo ();
+  int initSound ();
+  int initInput ();
+  int initNetworking ();
+  int initResources ();
+
  private:
   static Orxonox* singletonRef;
@@ -31 +50 @@
 
   char configfilename[256];   //!< Filename of the configuration-file.
-  World* world;               //!< Reference to the current running world.
-  SDL_Surface* screen;        //!< The current Screen
   GameLoader* gameLoader;     //!< The gameLoader
   ResourceManager* resourceManager; //!< The ResourceManager
@@ -46 +63 @@
   
   void getConfigFile (int argc, char** argv);
-  
-  // subsystem initialization
-  int initVideo ();
-  int initSound ();
-  int initInput ();
-  int initNetworking ();
-  int initResources ();
-  int initWorld ();
-  
- public:
-  static Orxonox* getInstance ();
-  virtual ~Orxonox ();
 
-  void start();
-  void quitGame();
-
-  void graphicsHandler (SDL_Event* event);
-  void process(const Event  &event);
-
-  int init (int argc, char** argv);
   
 
-  World* getWorld();
-  SDL_Surface* getScreen ();
-  
-  //void mainLoop();
 };