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

Timestamp:

Jan 10, 2016, 1:54:11 PM (9 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/TeamBaseMatchScore.cc (modified) (2 diffs)

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

@@ -43 +43 @@
         RegisterObject(TeamBaseMatchScore);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
 
         this->bShowBases_ = false;
@@ -120 +120 @@
             this->owner_ = orxonox_cast<TeamBaseMatch*>(this->getOwner()->getGametype());
         else
-            this->owner_ = 0;
+            this->owner_ = nullptr;
     }
 }