--- a/src/PhysicsObject.cc Sun Dec 07 21:18:09 2008 +0000
+++ b/src/PhysicsObject.cc Sun Dec 07 21:34:12 2008 +0000
@@ -4,9 +4,9 @@
#include <cmath>
-PhysicsObject::PhysicsObject (PhysicsWorld &world, float mass, Vector position, Vector velocity, bool enabled) :
+PhysicsObject::PhysicsObject (PhysicsWorld &world, float mass, Vector position, Vector velocity, ObjectType type, bool enabled) :
world(world), position(position), velocity(velocity), mass(mass), inAir(true), aim(0), facing(FACING_RIGHT),
- alive(false), shouldDelete(false), pivot(NULL)
+ alive(false), shouldDelete(false), type(type), pivot(NULL)
{
if (enabled)
enable();
@@ -203,7 +203,6 @@
}
if (collided)
break;
-// reached += unitVector;
}