Changeset 11062 for code/branches/cpp11_v3/src/orxonox/worldentities

Timestamp:

Jan 13, 2016, 11:13:30 PM (9 years ago)

Author:

landauf

Message:

added c++11 features to code that was modified in presentationHS15

Location:

code/branches/cpp11_v3/src/orxonox/worldentities

Files:

• TeamSpawnPoint.h (modified) (1 diff)
• pawns/Pawn.cc (modified) (3 diffs)

code/branches/cpp11_v3/src/orxonox/worldentities/TeamSpawnPoint.h

@@ -49 +49 @@
             unsigned int getTeamNumber() const
                 { return this->teamNumber_; }
-            virtual Pawn* spawn();
+            virtual Pawn* spawn() override;
 
         private:

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

@@ -86 +86 @@
         this->aimPosition_ = Vector3::ZERO;
 
-        //this->explosionPartList_ = NULL;
+        //this->explosionPartList_ = nullptr;
 
         if (GameMode::isMaster())
@@ -523 +523 @@
     Munition* Pawn::getMunitionXML() const
     {
-        return NULL;
+        return nullptr;
     }
 
@@ -533 +533 @@
         }
 
-        return NULL;
+        return nullptr;
     }