Changeset 10624 for code/trunk/src/modules/overlays

Timestamp:

Oct 4, 2015, 9:12:21 PM (9 years ago)

Author:

landauf

Message:

merged branch core7 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/overlays/hud/HUDHealthBar.h (modified) (1 diff)
• src/modules/overlays/hud/HUDNavigation.cc (modified) (1 diff)
• src/modules/overlays/hud/LastManStandingInfos.cc (modified) (1 diff)
• src/modules/overlays/hud/LastTeamStandingInfos.cc (modified) (1 diff)
• src/modules/overlays/hud/TeamBaseMatchScore.cc (modified) (1 diff)

code/trunk/src/modules/overlays/hud/HUDHealthBar.h

@@ -115 +115 @@
         private:
             WeakPtr<Pawn> owner_;
-            SmartPtr<OverlayText> textoverlay_;
+            StrongPtr<OverlayText> textoverlay_;
             bool bUseBarColour_;
             ColourValue textColour_;

code/trunk/src/modules/overlays/hud/HUDNavigation.cc

@@ -41 +41 @@
 #include "util/Math.h"
 #include "util/Convert.h"
-#include "core/command/ConsoleCommand.h"
+#include "core/command/ConsoleCommandIncludes.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"

code/trunk/src/modules/overlays/hud/LastManStandingInfos.cc

@@ -87 +87 @@
         {
             this->player_ = orxonox_cast<PlayerInfo*>(this->getOwner());
-            this->lms_ = orxonox_cast<LastManStanding*>(this->getOwner()->getGametype().get());
+            this->lms_ = orxonox_cast<LastManStanding*>(this->getOwner()->getGametype());
         }
         else

code/trunk/src/modules/overlays/hud/LastTeamStandingInfos.cc

@@ -87 +87 @@
         {
             this->player_ = orxonox_cast<PlayerInfo*>(this->getOwner());
-            this->lts_ = orxonox_cast<LastTeamStanding*>(this->getOwner()->getGametype().get());
+            this->lts_ = orxonox_cast<LastTeamStanding*>(this->getOwner()->getGametype());
         }
         else

code/trunk/src/modules/overlays/hud/TeamBaseMatchScore.cc

@@ -118 +118 @@
 
         if (this->getOwner() && this->getOwner()->getGametype())
-            this->owner_ = orxonox_cast<TeamBaseMatch*>(this->getOwner()->getGametype().get());
+            this->owner_ = orxonox_cast<TeamBaseMatch*>(this->getOwner()->getGametype());
         else
             this->owner_ = 0;