Changeset 6067 for code/branches/particles2/src/modules

Timestamp:

Nov 15, 2009, 1:44:25 PM (15 years ago)

Author:

rgrieder

Message:

Merged revisions 6054, 6056 and 6057 to particles2 branch.

Location:

code/branches/particles2

Files:

• . (modified) (1 prop)
• src/modules/overlays/hud/HUDHealthBar.cc (modified) (3 diffs)
• src/modules/overlays/hud/HUDHealthBar.h (modified) (1 diff)
• src/modules/overlays/hud/UnderAttackHealthBar.cc (modified) (3 diffs)
• src/modules/overlays/hud/UnderAttackHealthBar.h (modified) (2 diffs)

code/branches/particles2/src/modules/overlays/hud/HUDHealthBar.cc

@@ -48 +48 @@
         this->textoverlay_ = new OverlayText(this);
 
-        assert(this->textoverlay_);
+        assert(this->textoverlay_.get());
 
         this->textoverlay_->setCaption("");
@@ -56 +56 @@
     {
         if (this->isInitialized())
+        {
             this->textoverlay_->destroy();
+            this->textoverlay_ = 0;
+        }
     }
 
@@ -106 +109 @@
         SUPER(HUDHealthBar, changedOverlayGroup);
 
-        this->getOverlayGroup()->addElement(this->textoverlay_);
+        this->getOverlayGroup()->addElement(this->textoverlay_.get());
     }
 

code/branches/particles2/src/modules/overlays/hud/HUDHealthBar.h

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

code/branches/particles2/src/modules/overlays/hud/UnderAttackHealthBar.cc

@@ -34 +34 @@
 #include "gametypes/UnderAttack.h"
 #include "worldentities/pawns/Destroyer.h"
+#include "overlays/OverlayGroup.h"
 
 namespace orxonox
@@ -58 +59 @@
     {
         if (this->isInitialized())
+        {
             this->text_->destroy();
+            this->text_ = 0;
+        }
     }
 
@@ -90 +94 @@
         }
     }
+    
+    void UnderAttackHealthBar::changedOverlayGroup()
+    {
+        SUPER(UnderAttackHealthBar, changedOverlayGroup);
+        
+        this->getOverlayGroup()->addElement(this->text_.get());
+    }
 
     void UnderAttackHealthBar::init()

code/branches/particles2/src/modules/overlays/hud/UnderAttackHealthBar.h

@@ -46 +46 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual void changedOwner();
+            virtual void changedOverlayGroup();
 
             inline void setDescriptionPickPoint(const Vector2& pickpoint)
@@ -61 +62 @@
 
             PlayerInfo* owner_;
-            OverlayText* text_;
+            SmartPtr<OverlayText> text_;
             Timer inittimer_;
     };