Changeset 2036 in orxonox.OLD for orxonox/trunk/src/orxonox.cc

Timestamp:

Jun 27, 2004, 7:48:44 PM (21 years ago)

Author:

patrick

Message:

orxonxo/trunk/src: extended framework: class inheritance, right including (had som bugs), framework not finished yet

File:

• orxonox/trunk/src/orxonox.cc (modified) (5 diffs)

orxonox/trunk/src/orxonox.cc

@@ -24 +24 @@
 */
 
-/* class definition header */
+#include <iostream>
+#include <cstdio>
+#include <GL/glut.h>
+
+#include "environment.h"
+#include "world.h"
+#include "input_output.h"
+#include "data_tank.h"
+#include "stdincl.h"
+#include "player.h"
+#include "npc.h"
+#include "shoot_laser.h"
+
 #include "orxonox.h"
 
-
 using namespace std;
 
 
-
 Orxonox::Orxonox () 
 {
@@ -40 +50 @@
 
 Orxonox::~Orxonox () 
-{
-  glutSetKeyRepeat(GLUT_KEY_REPEAT_ON);
-}
+{}
 
 
@@ -63 +71 @@
 //int Orxonox::offsetY = 0;
 
+
 Orxonox* Orxonox::getInstance (void)
 {
@@ -79 +88 @@
   //glutFullScreen();
   glutInitWindowPosition(100, 100);
-  glutCreateWindow("orxOnox");
+  glutCreateWindow("OrxonoX");
   glShadeModel(GL_FLAT);
   /* window event dispatchers */
@@ -138 +147 @@
   io->setPlayerStep(19.2/fps); /* set player to propper speed */
   localPlayer->shootLaser->setShootStep(20.0/fps); /* set shoot speed */
-  localPlayer->shootRocket->setShootStep(20.0/fps); /* set shoot speed */
   world->setWorldStep(7.0/fps); /* set the speed of the terrain moving away */
   fps = 0;