[Orxonox-commit 4295] r8966 - in code/branches/hud: data/overlays src/modules/overlays/hud

[mspaling at orxonox.net]

Author: mspaling
Date: 2011-12-07 18:33:40 +0100 (Wed, 07 Dec 2011)
New Revision: 8966

Modified:
   code/branches/hud/data/overlays/HUDTemplates3.oxo
   code/branches/hud/src/modules/overlays/hud/HUDHealthBar.h
Log:
worked on the enemyhealthbar again

Modified: code/branches/hud/data/overlays/HUDTemplates3.oxo
===================================================================
--- code/branches/hud/data/overlays/HUDTemplates3.oxo	2011-12-07 15:00:37 UTC (rev 8965)
+++ code/branches/hud/data/overlays/HUDTemplates3.oxo	2011-12-07 17:33:40 UTC (rev 8966)
@@ -81,8 +81,8 @@
      name              = "EnemyHealthBar"
      background        = "Orxonox/HealthBarBackground"
      size              = "0.35, 0.0875"
-     position          = "0.5 , 0.1 "
-     pickpoint         = "0, 1"
+     position          = "1.0 , 0.1 "
+     pickpoint         = "1, 1"
      bartexture        = "healthbar_bar.png"
      textfont          = "VeraMono"
      textusebarcolour  = true
@@ -96,7 +96,7 @@
       <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
       <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
       <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
-    </HUDHealthBar>
+    </HUDEnemyHealthBar>
 
     <HUDNavigation
      name          = "Navigation"

Modified: code/branches/hud/src/modules/overlays/hud/HUDHealthBar.h
===================================================================
--- code/branches/hud/src/modules/overlays/hud/HUDHealthBar.h	2011-12-07 15:00:37 UTC (rev 8965)
+++ code/branches/hud/src/modules/overlays/hud/HUDHealthBar.h	2011-12-07 17:33:40 UTC (rev 8966)
@@ -109,6 +109,11 @@
             inline float getTextSpaceWidth() const
                 { return this->textoverlay_->getSpaceWidth(); }
 
+            inline void setOverlayText(SmartPtr<OverlayText> textoverlay)
+                { this->textoverlay_ = textoverlay; }
+            inline SmartPtr<OverlayText> getOverlayText() const
+                {return this->textoverlay_; }
+
         private:
             WeakPtr<Pawn> owner_;
             SmartPtr<OverlayText> textoverlay_;