Changeset 6295 for code/branches/presentation2/src/orxonox/worldentities/MovableEntity.cc

Timestamp:

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

Author:

wirthmi

Message:

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

File:

• code/branches/presentation2/src/orxonox/worldentities/MovableEntity.cc (modified) (1 diff)

code/branches/presentation2/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);
             }
         }