Changeset 6295 for code/branches/presentation2/src/modules

Timestamp:

Dec 9, 2009, 4:54:20 PM (15 years ago)

Author:

wirthmi

Message:

Changed a function call when hit from damage() to hit(). Pass through to controller

Location:

code/branches/presentation2/src/modules/weapons/projectiles

Files:

• Projectile.cc (modified) (1 diff)
• Rocket.cc (modified) (1 diff)

code/branches/presentation2/src/modules/weapons/projectiles/Projectile.cc

@@ -129 +129 @@
             Pawn* victim = orxonox_cast<Pawn*>(otherObject);
             if (victim)
-                victim->damage(dmg, this->owner_);
+                victim->hit(this->owner_, contactPoint, dmg);
         }
         return false;

code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc

@@ -203 +203 @@
             Pawn* victim = orxonox_cast<Pawn*>(otherObject);
             if (victim)
-                victim->damage(dmg, this->owner_);
+                victim->hit(this->owner_, contactPoint, dmg);
 //             this->destroy();
         }