diff -r 7e0cfc5f0944 -r 440763821484 src/Rope.cc --- a/src/Rope.cc Mon Dec 08 21:15:52 2008 +0000 +++ b/src/Rope.cc Mon Dec 08 21:18:08 2008 +0000 @@ -6,7 +6,10 @@ #include Rope::Rope(Player &player) : - PhysicsObject(player.state.world, ROPE_MASS, Vector(0,0), Vector(0,0), ROPE, 0.00, false), player(player), state(ROPE_FOLDED), pivotObject(NULL) + PhysicsObject(player.state.world, ROPE_MASS, Vector(0,0), Vector(0,0), ROPE, 0.00, false), + player(player), + pivotObject(NULL), + state(ROPE_FOLDED) { // XXX: better shape std::vector shape(4); @@ -38,7 +41,6 @@ } void Rope::onCollision (Vector collisionPoint, PhysicsObject *other) { - if (other != NULL) { if (other->getType() == PLAYER) { Player *target = dynamic_cast(other);