Changeset 9667 for code/trunk/src/modules/overlays/hud/HUDBar.cc

Timestamp:

Aug 25, 2013, 9:08:42 PM (12 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/overlays/hud/HUDBar.cc (modified) (2 diffs)

code/trunk/src/modules/overlays/hud/HUDBar.cc

@@ -45 +45 @@
 namespace orxonox
 {
-    CreateFactory(BarColour);
-
-    BarColour::BarColour(BaseObject* creator)
-        : BaseObject(creator)
+    RegisterClass(BarColour);
+
+    BarColour::BarColour(Context* context)
+        : BaseObject(context)
     {
         RegisterObject(BarColour);
@@ -67 +67 @@
     unsigned int HUDBar::materialcount_s = 0;
 
-    HUDBar::HUDBar(BaseObject* creator)
-        : OrxonoxOverlay(creator), right2Left_(false), autoColour_(false)
+    RegisterClass(HUDBar);
+
+    HUDBar::HUDBar(Context* context)
+        : OrxonoxOverlay(context), right2Left_(false), autoColour_(false)
     {
         RegisterObject(HUDBar);