--- a/src/Projectile.cc Mon Dec 08 20:33:40 2008 +0000
+++ b/src/Projectile.cc Mon Dec 08 20:57:16 2008 +0000
@@ -36,9 +36,17 @@
destroy();
}
-
-void Projectile::onHitPlayer (Player *player, Health damage) {
- player->takeDamage(damage);
+
+Health Projectile::getDamage () {
+ return weapon->getDamage();
+}
+
+void Projectile::addKillToOwner () {
+ player->addKill();
+}
+
+void Projectile::onHitPlayer (Player *player) {
+ player->takeDamage(this);
}
void Projectile::onCollision (Vector collisionPoint, PhysicsObject *other) {
@@ -47,7 +55,7 @@
Player* player = dynamic_cast<Player*>(other);
// XXX: check that player really is !NULL
- onHitPlayer(player, weapon->getDamage());
+ onHitPlayer(player);
}
if (collision_elasticity == 0)