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

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

Files:

• SpaceRaceController.cc (modified) (4 diffs)
• SpaceRaceManager.cc (modified) (2 diffs)

code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceController.cc

@@ -416 +416 @@
         for (std::vector<StaticEntity*>::const_iterator it = allObjects.begin(); it != allObjects.end(); ++it)
         {
-            for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape) != 0; everyShape++)
+            for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape) != nullptr; everyShape++)
             {
                 btCollisionShape* currentShape = (*it)->getAttachedCollisionShape(everyShape)->getCollisionShape();
@@ -444 +444 @@
         for (std::vector<StaticEntity*>::iterator it = allObjects.begin(); it != allObjects.end(); ++it)
         {
-            for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape) != 0; everyShape++)
+            for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape) != nullptr; everyShape++)
             {
                 btCollisionShape* currentShape = (*it)->getAttachedCollisionShape(everyShape)->getCollisionShape();
@@ -540 +540 @@
         //                    {   orxout()<<"Problempoint 1.1"<<endl; continue;}
         //                    //TODO: Probably it points on a wrong object
-        //                    for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape)!=0; everyShape++)
+        //                    for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape)!=nullptr; everyShape++)
         //                    {
         //                        if((*it)->getAttachedCollisionShape(everyShape)->getCollisionShape()==nullptr)
@@ -572 +572 @@
         //                        if((*it)==nullptr)
         //                        {   orxout()<<"Problempoint 1"<<endl; continue;}
-        //                        for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape)!=0; everyShape++)
+        //                        for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape)!=nullptr; everyShape++)
         //                        {
         //                            if((*it)->getAttachedCollisionShape(everyShape)->getCollisionShape()==nullptr)

code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.cc

@@ -100 +100 @@
         return this->checkpoints_[index];
         else
-        return 0;
+        return nullptr;
     }
 
@@ -116 +116 @@
         if (this->checkpoints_[i]->getCheckpointIndex() == index)
         return this->checkpoints_[i];
-        return 0;
+        return nullptr;
     }