Changeset 10011 for code/branches/modularships/src/modules/weapons/projectiles/Projectile.cc

Timestamp:

Apr 2, 2014, 8:38:07 PM (10 years ago)

Author:

noep

Message:

Cleaned up the process passing the collisionshape which was hit to the Pawn. Started implementation of ModularSpaceShip and ShipPart.

File:

• code/branches/modularships/src/modules/weapons/projectiles/Projectile.cc (modified) (1 diff)

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

@@ -88 +88 @@
     }
 
-    bool Projectile::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    bool Projectile::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
     {
-        return this->processCollision(otherObject, contactPoint);
-    }
-
-    bool Projectile::customCollidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
-    {
-        return this->customProcessCollision(otherObject, contactPoint, cs);
+        return this->processCollision(otherObject, contactPoint, cs);
     }