Changeset 10768 for code/branches/cpp11_v2/src/orxonox/items

Timestamp:

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

Author:

landauf

Message:

replace '0' by 'nullptr'

Location:

code/branches/cpp11_v2/src/orxonox/items

Files:

• Engine.cc (modified) (2 diffs)
• MultiStateEngine.cc (modified) (1 diff)

code/branches/cpp11_v2/src/orxonox/items/Engine.cc

@@ -50 +50 @@
         RegisterObject(Engine);
 
-        this->ship_ = 0;
+        this->ship_ = nullptr;
         this->shipID_ = OBJECTID_UNKNOWN;
         this->relativePosition_ = Vector3::ZERO;
@@ -136 +136 @@
     void Engine::networkcallback_shipID()
     {
-        this->ship_ = 0;
+        this->ship_ = nullptr;
 
         if (this->shipID_ != OBJECTID_UNKNOWN)

code/branches/cpp11_v2/src/orxonox/items/MultiStateEngine.cc

@@ -67 +67 @@
         else
         {
-            this->defEngineSndBoost_ = 0;
-            this->defEngineSndNormal_ = 0;
-            this->lua_ = 0;
+            this->defEngineSndBoost_ = nullptr;
+            this->defEngineSndNormal_ = nullptr;
+            this->lua_ = nullptr;
         }
         this->state_ = 0;