Changeset 1872 in orxonox.OLD for orxonox/trunk/core/orxonox.h

Timestamp:

May 6, 2004, 10:50:39 PM (21 years ago)

Author:

patrick

Message:

orxonox/trunk: play the square - its possible now…

File:

• orxonox/trunk/core/orxonox.h (modified) (2 diffs)

orxonox/trunk/core/orxonox.h

@@ -1 +1 @@
 
-#include "world.h"
+
 
 #ifndef ORXONOX_H
 #define ORXONOX_H
 
-#define NULL 0
+/* standard headers */
+#include <iostream>
+#include <cstdio>
+
+/* openGL Headers */
+#include <GL/glut.h>
+
+#include "world.h"
+#include "input_output.h"
+#include "data_tank.h"
+#include "stdincl.h"
+
+
 
 class Orxonox {
 
  private:
-  static Orxonox *singleton_ref;
+  static Orxonox* singleton_ref;
   Orxonox ();
   ~Orxonox ();
+  static World* world;
+  static InputOutput* io;
+  static bool pause;
 
  public:
@@ -21 +36 @@
   int menuInit (void);
   int gameInit (void);
+  void testTheShit(void);
   static void display (void);
+  static void continousRedraw(void);
   static void reshape (int w, int h);
   static void keyboard(unsigned char key, int x, int y);