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

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

Files:

• DodgeRace.cc (modified) (4 diffs)
• DodgeRaceCenterPoint.cc (modified) (1 diff)
• DodgeRaceShip.cc (modified) (2 diffs)

code/branches/cpp11_v2/src/modules/dodgerace/DodgeRace.cc

@@ -67 +67 @@
     {
         level++;
-        if (getPlayer() != NULL)
+        if (getPlayer() != nullptr)
         {
             for (int i = 0; i < 7; i++)
@@ -85 +85 @@
     void DodgeRace::tick(float dt)
     {
-        if (getPlayer() != NULL)
+        if (getPlayer() != nullptr)
         {
             currentPosition = getPlayer()->getWorldPosition().x;
@@ -134 +134 @@
     DodgeRaceShip* DodgeRace::getPlayer()
     {
-        if (player == NULL)
+        if (player == nullptr)
         {
             for (ObjectList<DodgeRaceShip>::iterator it = ObjectList<DodgeRaceShip>::begin(); it != ObjectList<DodgeRaceShip>::end(); ++it)
@@ -173 +173 @@
         this->bForceSpawn_ = false;
 
-        if (this->center_ == NULL)  // abandon mission!
+        if (this->center_ == nullptr)  // abandon mission!
         {
             orxout(internal_error) << "DodgeRace: No Centerpoint specified." << endl;

code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceCenterPoint.cc

@@ -56 +56 @@
     void DodgeRaceCenterPoint::checkGametype()
     {
-        if (this->getGametype() != NULL && this->getGametype()->isA(Class(DodgeRace)))
+        if (this->getGametype() != nullptr && this->getGametype()->isA(Class(DodgeRace)))
         {
             DodgeRace* DodgeRaceGametype = orxonox_cast<DodgeRace*>(this->getGametype());

code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.cc

@@ -91 +91 @@
         // Camera
         Camera* camera = this->getCamera();
-        if (camera != NULL)
+        if (camera != nullptr)
         {
             // camera->setPosition(Vector3(-pos.z, -posforeward, 0));
@@ -152 +152 @@
     DodgeRace* DodgeRaceShip::getGame()
     {
-        if (game == NULL)
+        if (game == nullptr)
         {
             for (ObjectList<DodgeRace>::iterator it = ObjectList<DodgeRace>::begin(); it != ObjectList<DodgeRace>::end(); ++it)