Changeset 10571 for code/branches/core7/src/orxonox

Timestamp:

Sep 9, 2015, 1:11:13 PM (9 years ago)

Author:

landauf

Message:

BaseObject returns plain pointers instead of StrongPtrs for Namespace, Level, Scene, and Gametype.

Location:

code/branches/core7/src/orxonox

Files:

• Scene.cc (modified) (1 diff)
• overlays/OverlayGroup.cc (modified) (1 diff)
• worldentities/pawns/Destroyer.cc (modified) (1 diff)
• worldentities/pawns/TeamBaseMatchBase.cc (modified) (2 diffs)

code/branches/core7/src/orxonox/Scene.cc

@@ -63 +63 @@
 
         this->setScene(StrongPtr<Scene>(this, false), this->getObjectID());
+
         this->bShadows_ = true;
         this->bDebugDrawPhysics_ = false;

code/branches/core7/src/orxonox/overlays/OverlayGroup.cc

@@ -38 +38 @@
 #include "core/command/ConsoleCommandIncludes.h"
 #include "OrxonoxOverlay.h"
+#include "gametypes/Gametype.h"
 
 namespace orxonox

code/branches/core7/src/orxonox/worldentities/pawns/Destroyer.cc

@@ -40 +40 @@
         RegisterObject(Destroyer);
 
-        UnderAttack* gametype = orxonox_cast<UnderAttack*>(this->getGametype().get());
+        UnderAttack* gametype = orxonox_cast<UnderAttack*>(this->getGametype());
         if (gametype)
         {

code/branches/core7/src/orxonox/worldentities/pawns/TeamBaseMatchBase.cc

@@ -45 +45 @@
         this->state_ = BaseState::Uncontrolled;
 
-        TeamBaseMatch* gametype = orxonox_cast<TeamBaseMatch*>(this->getGametype().get());
+        TeamBaseMatch* gametype = orxonox_cast<TeamBaseMatch*>(this->getGametype());
         if (gametype)
         {
@@ -58 +58 @@
         this->fireEvent();
 
-        TeamDeathmatch* gametype = orxonox_cast<TeamDeathmatch*>(this->getGametype().get());
+        TeamDeathmatch* gametype = orxonox_cast<TeamDeathmatch*>(this->getGametype());
         if (!gametype)
             return;