Changeset 2707 in orxonox.OLD for orxonox/branches/buerli/src/orxonox.h

Timestamp:

Nov 3, 2004, 12:29:03 AM (21 years ago)

Author:

bensch

Message:

orxonox/branches/buerli: merged back from trunk, with new configure makefile and so forth.

File:

• orxonox/branches/buerli/src/orxonox.h (modified) (4 diffs)

orxonox/branches/buerli/src/orxonox.h

@@ -16 +16 @@
 class World;
 class Camera;
+class GameLoader;
 
 //! Orxonox core singleton class
@@ -33 +34 @@
   Camera* localcamera;
   SDL_Surface* screen;
+  GameLoader* gameLoader;
   
   bool bQuitOrxonox;
   bool pause;
-        Uint32 lastframe;
-
-        void get_config_file (int argc, char** argv);
-        
-                // main loop functions
+  Uint32 lastframe;
+  
+  void get_config_file (int argc, char** argv);
+  
+  // main loop functions
   void synchronize ();
   void handle_input ();
@@ -57 +59 @@
  public:
   static Orxonox* getInstance ();
+  void start();
   void quitGame();
 
@@ -63 +66 @@
 
   int init (int argc, char** argv);
-        
-        CommandNode* get_localinput();
-        Camera* get_camera();
-        World* get_world();
-        
+  
+  CommandNode* get_localinput();
+  Camera* get_camera();
+  World* get_world();
+  
   void mainLoop();
 };