Changeset 6412 for code/branches/pickup2/src/modules/overlays/hud/UnderAttackHealthBar.cc

Timestamp:

Dec 25, 2009, 1:18:03 PM (16 years ago)

Author:

dafrick

Message:

Merged presentation2 branch into pickup2 branch.

Location:

code/branches/pickup2

Files:

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

code/branches/pickup2/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;
+        }
     }
 
@@ -91 +95 @@
     }
 
+    void UnderAttackHealthBar::changedOverlayGroup()
+    {
+        SUPER(UnderAttackHealthBar, changedOverlayGroup);
+
+        this->getOverlayGroup()->addElement(this->text_.get());
+    }
+
     void UnderAttackHealthBar::init()
     {