Changeset 10011 for code/branches/modularships/src/modules/weapons/projectiles/Rocket.h

Timestamp:

Apr 2, 2014, 8:38:07 PM (11 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/Rocket.h (modified) (1 diff)

code/branches/modularships/src/modules/weapons/projectiles/Rocket.h

@@ -64 +64 @@
             virtual void tick(float dt); //!< Defines which actions the Rocket has to take in each tick.
 
-            virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
-            virtual bool customCollidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
             virtual void destroyObject(void);
             void destructionEffect();