Changeset 8966 for code/branches

Timestamp:

Dec 7, 2011, 6:33:40 PM (13 years ago)

Author:

mspaling

Message:

worked on the enemyhealthbar again

Location:

code/branches/hud

Files:

• data/overlays/HUDTemplates3.oxo (modified) (2 diffs)
• src/modules/overlays/hud/HUDHealthBar.h (modified) (1 diff)

code/branches/hud/data/overlays/HUDTemplates3.oxo

@@ -82 +82 @@
      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"
@@ -97 +97 @@
       <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

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

@@ -110 +110 @@
                 { 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_;