Changeset 6412 for code/branches/pickup2/src/orxonox/worldentities/MovableEntity.cc

Timestamp:

Dec 25, 2009, 1:18:03 PM (16 years ago)

Author:

dafrick

Message:

Merged presentation2 branch into pickup2 branch.

Location:

code/branches/pickup2

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/MovableEntity.cc (modified) (1 diff)

code/branches/pickup2/src/orxonox/worldentities/MovableEntity.cc

@@ -79 +79 @@
             if (victim)
             {
-                victim->damage(this->collisionDamage_ * (victim->getVelocity() - this->getVelocity()).length());
+                float damage = this->collisionDamage_ * (victim->getVelocity() - this->getVelocity()).length();
+                victim->hit(0, contactPoint, damage);
             }
         }