Changeset 10768 for code/branches/cpp11_v2/src/orxonox/worldentities/pawns

Timestamp:

Nov 6, 2015, 10:54:34 PM (9 years ago)

Author:

landauf

Message:

replace '0' by 'nullptr'

Location:

code/branches/cpp11_v2/src/orxonox/worldentities/pawns

Files:

• ModularSpaceShip.cc (modified) (1 diff)
• Pawn.cc (modified) (8 diffs)
• Pawn.h (modified) (1 diff)
• SpaceShip.cc (modified) (2 diffs)
• Spectator.cc (modified) (1 diff)

code/branches/cpp11_v2/src/orxonox/worldentities/pawns/ModularSpaceShip.cc

@@ -53 +53 @@
     RegisterClass(ModularSpaceShip);
 
-    std::map<StaticEntity*, ShipPart*>* ModularSpaceShip::partMap_s = 0;
+    std::map<StaticEntity*, ShipPart*>* ModularSpaceShip::partMap_s = nullptr;
 
     ModularSpaceShip::ModularSpaceShip(Context* context) : SpaceShip(context)

code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.cc

@@ -76 +76 @@
         this->reloadWaitCountdown_ = 0;
 
-        this->lastHitOriginator_ = 0;
+        this->lastHitOriginator_ = nullptr;
 
         // set damage multiplier to default value 1, meaning nominal damage
@@ -91 +91 @@
         }
         else
-            this->weaponSystem_ = 0;
+            this->weaponSystem_ = nullptr;
 
         this->setRadarObjectColour(ColourValue::Red);
@@ -109 +109 @@
         else
         {
-            this->explosionSound_ = 0;
+            this->explosionSound_ = nullptr;
         }
     }
@@ -345 +345 @@
                     {
                         // delete the AIController // <-- TODO: delete? nothing is deleted here... should we delete the controller?
-                        slave->setControllableEntity(0);
+                        slave->setControllableEntity(nullptr);
 
                         // set a new master within the formation
@@ -509 +509 @@
             return this->weaponSystem_->getWeaponSlot(index);
         else
-            return 0;
+            return nullptr;
     }
 
@@ -523 +523 @@
             return this->weaponSystem_->getWeaponSet(index);
         else
-            return 0;
+            return nullptr;
     }
 
@@ -551 +551 @@
             return this->weaponSystem_->getWeaponPack(index);
         else
-            return 0;
+            return nullptr;
     }
 
@@ -594 +594 @@
                 return it->getController();
         }
-        return 0;
+        return nullptr;
     }
 

code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.h

@@ -207 +207 @@
             virtual void spawneffect();
 
-            //virtual void damage(float damage, Pawn* originator = 0);
+            //virtual void damage(float damage, Pawn* originator = nullptr);
             virtual void damage(float damage, float healthdamage = 0.0f, float shielddamage = 0.0f, Pawn* originator = nullptr, const btCollisionShape* cs = nullptr);
 

code/branches/cpp11_v2/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -494 +494 @@
             Camera* camera = this->getCamera();
             //Shaking Camera effect
-            if (camera != 0)
+            if (camera != nullptr)
                 camera->setOrientation(Vector3::UNIT_X, angle);
 
@@ -526 +526 @@
         {
             Camera *camera = this->getCamera();
-            if (camera == 0)
+            if (camera == nullptr)
             {
                 orxout(internal_warning) << "Failed to reset camera!" << endl;

code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Spectator.cc

@@ -58 +58 @@
         this->localVelocity_ = Vector3::ZERO;
         this->setHudTemplate("spectatorhud");
-        this->greetingFlare_ = 0;
+        this->greetingFlare_ = nullptr;
 
         this->setDestroyWhenPlayerLeft(true);