Changeset 6067 for code/branches/particles2/src/modules/overlays/hud/UnderAttackHealthBar.cc

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/UnderAttackHealthBar.cc (modified) (3 diffs)

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()