Changeset 10765 for code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.cc

Timestamp:

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

Author:

landauf

Message:

replace 'NULL' by 'nullptr'

File:

• code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.cc (modified) (6 diffs)

code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.cc

@@ -92 +92 @@
                 this->gtinfo_->destroy();
 
-            ModifyConsoleCommand(__CC_addBots_name).setObject(NULL);
-            ModifyConsoleCommand(__CC_killBots_name).setObject(NULL);
+            ModifyConsoleCommand(__CC_addBots_name).setObject(nullptr);
+            ModifyConsoleCommand(__CC_killBots_name).setObject(nullptr);
         }
     }
@@ -337 +337 @@
         {
             // Fallback spawn point if there is no active one, choose a random one.
-            SpawnPoint* fallbackSpawnPoint = NULL;
+            SpawnPoint* fallbackSpawnPoint = nullptr;
             unsigned int randomspawn = static_cast<unsigned int>(rnd(static_cast<float>(this->spawnpoints_.size())));
             unsigned int index = 0;
@@ -346 +346 @@
                     fallbackSpawnPoint = (*it);
 
-                if (*it != NULL && (*it)->isActive())
+                if (*it != nullptr && (*it)->isActive())
                     activeSpawnPoints.push_back(*it);
 
@@ -552 +552 @@
         }
 
-        return NULL;
+        return nullptr;
     }
 
@@ -558 +558 @@
     {
         // find correct memento state
-        GametypeMementoState* state = NULL;
+        GametypeMementoState* state = nullptr;
         for (size_t i = 0; i < states.size(); ++i)
         {
@@ -570 +570 @@
 
         // find correct scene
-        Scene* scene = NULL;
+        Scene* scene = nullptr;
         for (ObjectList<Scene>::iterator it = ObjectList<Scene>::begin(); it != ObjectList<Scene>::end(); ++it)
         {