Changeset 10760 for code/branches/hoverHS15/src/modules/invader

Timestamp:

Nov 2, 2015, 6:01:56 PM (9 years ago)

Author:

fvultier

Message:

2 problems fixed: The collidesAgainst function in the hovership get now properly called. The Hoverhalls have a collisionShape that works.

Location:

code/branches/hoverHS15/src/modules/invader

Files:

• InvaderShip.cc (modified) (1 diff)
• InvaderShip.h (modified) (1 diff)

code/branches/hoverHS15/src/modules/invader/InvaderShip.cc

@@ -139 +139 @@
         isFireing = bBoost;
     }
-    inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
     {
         // orxout() << "touch!!! " << endl; //<< otherObject << " at " << contactPoint;

code/branches/hoverHS15/src/modules/invader/InvaderShip.h

@@ -65 +65 @@
             virtual void updateLevel();
 
-            virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+            virtual inline bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
 
         protected: