# HG changeset patch # User ekku # Date 1228781432 0 # Node ID 47dc65c8df71007a54993fad96803e84e88ac6f4 # Parent 0cf3f2be51eb536a438231dcd642d4cdad0ec17d Players dont collide diff -r 0cf3f2be51eb -r 47dc65c8df71 src/Player.cc --- a/src/Player.cc Mon Dec 08 23:52:08 2008 +0000 +++ b/src/Player.cc Tue Dec 09 00:10:32 2008 +0000 @@ -284,12 +284,12 @@ // Player-projectile collision is handled in projectile's onCollision. // XXX: not completely network-safe if (other->getType() == PLAYER) { - Vector normal = this->getPosition() - other->getPosition(); - this->bounce(normal); + //Vector normal = this->getPosition() - other->getPosition(); + //this->bounce(normal); // Move the player back to its previous position so that players won't // stuff inside each others when having a collision walk, e.g. - this->setPosition(this->getPreviousPosition()); + //this->setPosition(this->getPreviousPosition()); } }