Changeset 2101 in orxonox.OLD for orxonox/branches/chris/src/player.cc

Timestamp:

Jul 10, 2004, 2:00:04 PM (21 years ago)

Author:

chris

Message:

orxonox/branches/chris: Finished the "GETITTOCOMPILE" project… compiling should work now, but linking is a different story

File:

• orxonox/branches/chris/src/player.cc (modified) (4 diffs)

orxonox/branches/chris/src/player.cc

@@ -16 +16 @@
 */
 
-#include <iostream>
-#include <stdlib.h>
-#include <GL/glut.h>
-
 #include "player.h"
+#include "stdincl.h"
+#include "collision.h"
 
 using namespace std;
@@ -40 +38 @@
         bFire = false;
         acceleration = 10.0;
-        set_collision (new CollisionCluster (1.0, Vector(0,0,0));
+        set_collision (new CollisionCluster (1.0, Vector(0,0,0)));
 }
 
@@ -46 +44 @@
 {
         // movement
-        move (float time);
+        move (time);
 }
 
@@ -104 +102 @@
         // a = acceleration
         
-        l->pos = l->pos + velocity*time + (accel*(0.5*t*t)));
+        l->pos = l->pos + velocity*time + (accel*(0.5*time*time));
         l->dist += travel_speed * time;
         
-        velocity += accel * time;
+        velocity = velocity + (accel * time);
 }