Changeset 10818 for code/branches/cpp11_v2/src/modules/dodgerace

Timestamp:

Nov 19, 2015, 7:55:11 PM (9 years ago)

Author:

muemart

Message:

• Fixed some suspicious virtual function signatures
• Fixed some clang warnings (and errors in the last commit, forgot to mention that)
• Fix compilation without pch
• Hack "override" keyword support into Tolua++

Location:

code/branches/cpp11_v2/src/modules/dodgerace

Files:

• DodgeRaceShip.cc (modified) (1 diff)
• DodgeRaceShip.h (modified) (2 diffs)

code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.cc

@@ -142 +142 @@
     }
 
-    inline bool DodgeRaceShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    inline bool DodgeRaceShip::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
     {
 

code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.h

@@ -70 +70 @@
             virtual void updateLevel();
 
+            virtual inline bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
+
             float speed, damping, posforeward;
             bool isFireing;
@@ -77 +79 @@
 
         private:
-            virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
             DodgeRace* getGame();
             WeakPtr<DodgeRace> game;