Changeset 3033 for code/trunk/src/orxonox/objects/worldentities/MovableEntity.cc

Timestamp:

May 23, 2009, 9:57:52 PM (15 years ago)

Author:

landauf

Message:

merged gametypes branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/MovableEntity.cc (modified) (2 diffs)

code/trunk/src/orxonox/objects/worldentities/MovableEntity.cc

@@ -35 +35 @@
 #include "core/Executor.h"
 #include "core/GameMode.h"
+#include "objects/worldentities/pawns/Pawn.h"
 
 namespace orxonox
@@ -67 +68 @@
     {
         SUPER(MovableEntity, XMLPort, xmlelement, mode);
+
+        XMLPortParam(MovableEntity, "enablecollisiondamage", setEnableCollisionDamage, getEnableCollisionDamage, xmlelement, mode).defaultValues(false);
+        XMLPortParam(MovableEntity, "collisiondamage", setCollisionDamage, getCollisionDamage, xmlelement, mode).defaultValues(1);
     }
+
+    bool MovableEntity::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    {
+        if (GameMode::isMaster() && enableCollisionDamage_)
+        {
+            Pawn* victim = dynamic_cast<Pawn*>(otherObject);
+            if (victim)
+            {
+                victim->damage(this->collisionDamage_ * victim->getVelocity().dotProduct(this->getVelocity()));
+            }
+        }
+
+        return false;
+    }
+
 
     void MovableEntity::registerVariables()