Changeset 10768 for code/branches/cpp11_v2/src/modules/jump

Timestamp:

Nov 6, 2015, 10:54:34 PM (9 years ago)

Author:

landauf

Message:

replace '0' by 'nullptr'

Location:

code/branches/cpp11_v2/src/modules/jump

Files:

• Jump.cc (modified) (3 diffs)
• JumpEnemy.cc (modified) (1 diff)
• JumpItem.cc (modified) (1 diff)
• JumpPlatform.cc (modified) (1 diff)
• JumpProjectile.cc (modified) (1 diff)
• JumpSpring.cc (modified) (1 diff)

code/branches/cpp11_v2/src/modules/jump/Jump.cc

@@ -65 +65 @@
         RegisterObject(Jump);
 
-        center_ = 0;
-        figure_ = 0;
-        camera = 0;
+        center_ = nullptr;
+        figure_ = nullptr;
+        camera = nullptr;
         setHUDTemplate("JumpHUD");
     }
@@ -270 +270 @@
     void Jump::cleanup()
     {
-        camera = 0;
+        camera = nullptr;
     }
 
@@ -340 +340 @@
         else
         {
-            return 0;
+            return nullptr;
         }
     }

code/branches/cpp11_v2/src/modules/jump/JumpEnemy.cc

@@ -51 +51 @@
 
         dead_ = false;
-        figure_ = 0;
+        figure_ = nullptr;
         width_ = 0.0;
         height_ = 0.0;

code/branches/cpp11_v2/src/modules/jump/JumpItem.cc

@@ -48 +48 @@
         attachedToFigure_ = false;
 
-        figure_ = 0;
+        figure_ = nullptr;
         height_ = 0.0;
         width_ = 0.0;

code/branches/cpp11_v2/src/modules/jump/JumpPlatform.cc

@@ -48 +48 @@
         RegisterObject(JumpPlatform);
 
-        figure_ = 0;
+        figure_ = nullptr;
 
         setPosition(Vector3(0,0,0));

code/branches/cpp11_v2/src/modules/jump/JumpProjectile.cc

@@ -47 +47 @@
         RegisterObject(JumpProjectile);
 
-        figure_ = 0;
+        figure_ = nullptr;
         setPosition(Vector3(0,0,0));
         setVelocity(Vector3(0,0,250.0));

code/branches/cpp11_v2/src/modules/jump/JumpSpring.cc

@@ -100 +100 @@
     void JumpSpring::accelerateFigure()
     {
-        if (figure_ != 0)
+        if (figure_ != nullptr)
         {
             figure_->JumpFromSpring(this);