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

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/tetris

Files:

• Tetris.cc (modified) (4 diffs)
• TetrisScore.cc (modified) (2 diffs)

code/branches/cpp11_v2/src/modules/tetris/Tetris.cc

@@ -66 +66 @@
         RegisterObject(Tetris);
 
-        this->activeBrick_ = 0;
+        this->activeBrick_ = nullptr;
 
         // Pre-set the timer, but don't start it yet.
@@ -74 +74 @@
         this->player_ = nullptr;
         this->setHUDTemplate("TetrisHUD");
-        this->futureBrick_ = 0;
+        this->futureBrick_ = nullptr;
     }
 
@@ -96 +96 @@
         {
             this->activeBrick_->destroy();
-            this->activeBrick_ = 0;
+            this->activeBrick_ = nullptr;
         }
         if (this->futureBrick_)
         {
             this->futureBrick_->destroy();
-            this->futureBrick_ = 0;
+            this->futureBrick_ = nullptr;
         }
 
@@ -396 +396 @@
         // Make the last brick to be created the active brick.
         this->activeBrick_ = this->futureBrick_;
-        this->futureBrick_ = 0;
+        this->futureBrick_ = nullptr;
 
         // set its position

code/branches/cpp11_v2/src/modules/tetris/TetrisScore.cc

@@ -56 +56 @@
         RegisterObject(TetrisScore);
 
-        this->owner_ = 0;
+        this->owner_ = nullptr;
         this->player_ = nullptr;
     }
@@ -120 +120 @@
             this->owner_ = orxonox_cast<Tetris*>(this->getOwner()->getGametype());
         else
-            this->owner_ = 0;
+            this->owner_ = nullptr;
     }
 }