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

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

Files:

• dodgerace/DodgeRaceShip.cc (modified) (1 diff)
• dodgerace/DodgeRaceShip.h (modified) (2 diffs)
• invader/InvaderEnemy.cc (modified) (1 diff)
• invader/InvaderEnemy.h (modified) (1 diff)
• invader/InvaderShip.cc (modified) (1 diff)
• invader/InvaderShip.h (modified) (1 diff)
• objects/controllers/TeamTargetProxy.cc (modified) (1 diff)
• objects/controllers/TurretController.cc (modified) (1 diff)
• towerdefense/TowerDefenseEnemy.cc (modified) (1 diff)
• towerdefense/TowerDefenseEnemy.h (modified) (1 diff)

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;

code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.cc

@@ -64 +64 @@
     }
 
-    inline bool InvaderEnemy::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    inline bool InvaderEnemy::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
     {
         if(orxonox_cast<InvaderShip*>(otherObject))

code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h

@@ -47 +47 @@
 
             virtual void tick(float dt) override;
-            virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
             virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) override;
             virtual void setPlayer(InvaderShip* player){this->player = player;}

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

@@ -148 +148 @@
                 getGame()->end();
     }
-    inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
     {
         // orxout() << "touch!!! " << endl; //<< otherObject << " at " << contactPoint;

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

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

code/branches/cpp11_v2/src/modules/objects/controllers/TeamTargetProxy.cc

@@ -28 +28 @@
 
 #include "TeamTargetProxy.h"
+#include "core/CoreIncludes.h"
 #include "worldentities/ControllableEntity.h"
 #include "worldentities/pawns/Pawn.h"

code/branches/cpp11_v2/src/modules/objects/controllers/TurretController.cc

@@ -30 +30 @@
 #include "worldentities/pawns/Pawn.h"
 #include "objects/Turret.h"
+#include "core/object/ObjectList.h"
+#include "core/CoreIncludes.h"
 
  namespace orxonox

code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.cc

@@ -55 +55 @@
     }
 
-    void TowerDefenseEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator)
+    void TowerDefenseEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs)
     {
         Pawn::damage(damage, healthdamage, shielddamage, originator);

code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.h

@@ -38 +38 @@
 
         virtual void tick(float dt) override;
-        virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator);
+        virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) override;
 
     private: