Changeset 11054 for code/branches/cpp11_v3/src/modules/overlays/hud/HUDHealthBar.cc

Timestamp:

Jan 10, 2016, 1:54:11 PM (10 years ago)

Author:

landauf

Message:

merged branch cpp11_v2 into cpp11_v3

Location:

code/branches/cpp11_v3

Files:

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

code/branches/cpp11_v3/src/modules/overlays/hud/HUDHealthBar.cc

@@ -43 +43 @@
         RegisterObject(HUDHealthBar);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
         this->bUseBarColour_ = false;
         this->textOffset_ = Vector2(0.0f, 0.0f);
@@ -66 +66 @@
         {
             this->textoverlay_->destroy();
-            this->textoverlay_ = NULL;
+            this->textoverlay_ = nullptr;
         }
     }