Changeset 10765 for code/branches/cpp11_v2/src/modules/mini4dgame

Timestamp:

Nov 4, 2015, 10:25:42 PM (10 years ago)

Author:

landauf

Message:

replace 'NULL' by 'nullptr'

Location:

code/branches/cpp11_v2/src/modules/mini4dgame

Files:

• Mini4Dgame.cc (modified) (3 diffs)
• Mini4DgameBoard.cc (modified) (1 diff)

code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.cc

@@ -88 +88 @@
     void Mini4Dgame::cleanup()
     {
-        if(this->board_ != NULL)// Destroy the board, if present.
+        if(this->board_ != nullptr)// Destroy the board, if present.
         {
             //this->board_->destroy();
@@ -101 +101 @@
     void Mini4Dgame::start()
     {
-        if (this->board_ != NULL) // There needs to be a Mini4DgameCenterpoint, i.e. the area the game takes place.
+        if (this->board_ != nullptr) // There needs to be a Mini4DgameCenterpoint, i.e. the area the game takes place.
         {
             /*
-            if (this->board_ == NULL)
+            if (this->board_ == nullptr)
             {
                 this->board_ = new Mini4DgameBoard(this->board_->getContext());
@@ -174 +174 @@
         assert(player);
 
-        if(false)//this->player_ == NULL)
+        if(false)//this->player_ == nullptr)
         {
             //this->player_ = player;

code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameBoard.cc

@@ -905 +905 @@
     void Mini4DgameBoard::checkGametype()
     {
-        if (this->getGametype() != NULL && this->getGametype()->isA(Class(Mini4Dgame)))
+        if (this->getGametype() != nullptr && this->getGametype()->isA(Class(Mini4Dgame)))
         {
             Mini4Dgame* Mini4DgameGametype = orxonox_cast<Mini4Dgame*>(this->getGametype());