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

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/orxonox

Files:

• Level.cc (modified) (1 diff)
• Level.h (modified) (1 diff)
• Scene.h (modified) (1 diff)
• chat/ChatHistory.cc (modified) (1 diff)
• gamestates/GSRoot.cc (modified) (1 diff)
• worldentities/Drone.cc (modified) (1 diff)
• worldentities/pawns/FpsPlayer.cc (modified) (1 diff)
• worldentities/pawns/FpsPlayer.h (modified) (1 diff)

code/branches/cpp11_v2/src/orxonox/Level.cc

@@ -30 +30 @@
 
 #include "util/Math.h"
+#include "util/SubString.h"
 #include "core/CoreIncludes.h"
 #include "core/Loader.h"

code/branches/cpp11_v2/src/orxonox/Level.h

@@ -37 +37 @@
 #include "core/BaseObject.h"
 #include "network/synchronisable/Synchronisable.h"
+#include "core/object/Context.h"
 #include "graphics/MeshLodInformation.h"
 

code/branches/cpp11_v2/src/orxonox/Scene.h

@@ -40 +40 @@
 #include "util/OgreForwardRefs.h"
 #include "core/BaseObject.h"
+#include "core/object/Context.h"
 #include "network/synchronisable/Synchronisable.h"
 #include "tools/interfaces/Tickable.h"

code/branches/cpp11_v2/src/orxonox/chat/ChatHistory.cc

@@ -30 +30 @@
 #include "core/singleton/ScopedSingletonIncludes.h"
 #include "core/ConfigurablePaths.h"
+#include "core/CoreIncludes.h"
 
 #ifndef CHATTEST

code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.cc

@@ -34 +34 @@
 #include "core/GameMode.h"
 #include "core/command/ConsoleCommandIncludes.h"
+#include "core/object/ObjectList.h"
 #include "network/NetworkFunctionIncludes.h"
 #include "tools/Timer.h"

code/branches/cpp11_v2/src/orxonox/worldentities/Drone.cc

@@ -30 +30 @@
 
 #include "core/XMLPort.h"
+#include "core/CoreIncludes.h"
 #include "BulletDynamics/Dynamics/btRigidBody.h"
 

code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.cc

@@ -282 +282 @@
     }
 
-    bool FpsPlayer::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    bool FpsPlayer::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
     {
         if (contactPoint.m_normalWorldOnB.y() > 0.6)

code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.h

@@ -69 +69 @@
             virtual void fire();
 
-            bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+            bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
 
             virtual void addedWeaponPack(WeaponPack* wPack);