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

Timestamp:

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

Author:

dafrick

Message:

Merged presentation2 branch into pickup2 branch.

Location:

code/branches/pickup2

Files:

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

code/branches/pickup2/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_;
     };