# HG changeset patch # User saiam # Date 1228770050 0 # Node ID 05a39422c81e0abf2f3ac6d2612d3030e97d1451 # Parent 60f4b55d5713ec1078c41f53feff4a7301b1befa You shouldn't get frags by killing yourself anymore. diff -r 60f4b55d5713 -r 05a39422c81e src/Player.cc --- a/src/Player.cc Mon Dec 08 20:57:16 2008 +0000 +++ b/src/Player.cc Mon Dec 08 21:00:50 2008 +0000 @@ -295,7 +295,9 @@ health -= source->getDamage(); if (health <= 0) { - source->addKillToOwner(); + if (this != source->getOwner()) { + source->addKillToOwner(); + } die(); } diff -r 60f4b55d5713 -r 05a39422c81e src/Projectile.cc --- a/src/Projectile.cc Mon Dec 08 20:57:16 2008 +0000 +++ b/src/Projectile.cc Mon Dec 08 21:00:50 2008 +0000 @@ -44,6 +44,10 @@ void Projectile::addKillToOwner () { player->addKill(); } + +const Player* Projectile::getOwner () { + return player; +} void Projectile::onHitPlayer (Player *player) { player->takeDamage(this); diff -r 60f4b55d5713 -r 05a39422c81e src/Projectile.hh --- a/src/Projectile.hh Mon Dec 08 20:57:16 2008 +0000 +++ b/src/Projectile.hh Mon Dec 08 21:00:50 2008 +0000 @@ -63,6 +63,11 @@ */ void addKillToOwner (); + /** + * Return the owner of the projectile. + */ + const Player* getOwner (); + protected: /** * Removes ground at given position if applicable, and destroys this PhysicsObject.