Changeset 10928 for code/branches/hoverHS15/src/modules/hover/HoverFlag.cc

Timestamp:

Dec 7, 2015, 2:05:58 PM (9 years ago)

Author:

meierman

Message:

Before finishing touch

File:

• code/branches/hoverHS15/src/modules/hover/HoverFlag.cc (modified) (2 diffs)

code/branches/hoverHS15/src/modules/hover/HoverFlag.cc

@@ -96 +96 @@
     {
         SUPER(HoverFlag, XMLPort, xmlelement, mode);
-
-       // XMLPortParam(HoverFlag, "height", setHeight, getHeight, xmlelement, mode);
-        //XMLPortParam(HoverFlag, "width", setWidth, getWidth, xmlelement, mode);
     }
 
@@ -119 +116 @@
     bool HoverFlag::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
     {
-        
-
-        if(otherObject->isA(Class(HoverShip))){
-
-            orxout()<<"TestCollision"<<endl;
+        if(otherObject->isA(Class(HoverShip)))
             collided_ = true;
-            //this->destroyLater();
-        }
-
-
-        /*if (GameMode::isMaster() && enableCollisionDamage_)
-        {
-            Pawn* victim = orxonox_cast<Pawn*>(otherObject);
-            if (victim)
-            {
-                float damage = this->collisionDamage_ * (victim->getVelocity() - this->getVelocity()).length();
-                victim->hit(0, contactPoint, ownCollisionShape, damage);
-            }
-        }*/
-
         return false;
     }