Changeset 2058 in orxonox.OLD for orxonox/branches/chris/src/world.cc

Timestamp:

Jul 2, 2004, 11:36:56 AM (21 years ago)

Author:

chris

Message:

orxonox/branches/chris: Trunk remerged into my branch started on SDL reconfiguration

File:

• orxonox/branches/chris/src/world.cc (modified) (6 diffs)

orxonox/branches/chris/src/world.cc

@@ -15 +15 @@
 */
 
+#include <iostream>
+#include <stdlib.h>
+#include <cmath>
+#include <GL/glut.h>
+
+#include "npc.h"
+#include "player.h"
+#include "environment.h"
+#include "shoot_laser.h"
+#include "shoot_rocket.h"
+#include "stdincl.h"
+#include "data_tank.h"
 
 #include "world.h"
 
-#include <iostream>
 
 using namespace std;
@@ -174 +185 @@
 void World::drawWorld(void) 
 {
+
   glLoadIdentity();
   gluLookAt(0.0, -14.0 + DataTank::yOffset, 15.0, 0.0, 0.0 + DataTank::yOffset, 0.0, 0.0, 1.0, 0.0);
@@ -181 +193 @@
   while( tmpPlayer != null ) 
     {
-      (*tmpPlayer->player).drawPlayer();
+      tmpPlayer->player->paint();
       tmpPlayer = tmpPlayer->next;
     }
@@ -188 +200 @@
   while( tmpNPC != null )
     {
-      (*tmpNPC->npc).drawNPC();
+      (*tmpNPC->npc).paint();
       tmpNPC = tmpNPC->next;
     }
@@ -235 +247 @@
     }
 
-  
+
 }
 
@@ -254 +266 @@
 void World::setWorldStep(float step)
 {
+  //cout << "World::setWorldStep(" << step << ");" << endl;
   this->step = step;
-  cout << "setting speed to " << step << endl;
+  //cout << "setting speed to " << step << endl;
 }