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

Timestamp:

Nov 4, 2015, 10:25:42 PM (9 years ago)

Author:

landauf

Message:

replace 'NULL' by 'nullptr'

Location:

code/branches/cpp11_v2/src/modules

Files:

• designtools/ScreenshotManager.cc (modified) (5 diffs)
• designtools/SkyboxGenerator.cc (modified) (1 diff)
• docking/Dock.cc (modified) (7 diffs)
• docking/DockToShip.cc (modified) (2 diffs)
• docking/DockingAnimation.cc (modified) (1 diff)
• docking/DockingController.cc (modified) (2 diffs)
• docking/DockingEffect.cc (modified) (1 diff)
• dodgerace/DodgeRace.cc (modified) (4 diffs)
• dodgerace/DodgeRaceCenterPoint.cc (modified) (1 diff)
• dodgerace/DodgeRaceShip.cc (modified) (2 diffs)
• gametypes/RaceCheckPoint.cc (modified) (1 diff)
• gametypes/SpaceRaceController.cc (modified) (14 diffs)
• gametypes/SpaceRaceManager.cc (modified) (2 diffs)
• invader/Invader.cc (modified) (4 diffs)
• invader/InvaderCenterPoint.cc (modified) (1 diff)
• invader/InvaderEnemy.cc (modified) (3 diffs)
• invader/InvaderEnemyShooter.cc (modified) (2 diffs)
• invader/InvaderShip.cc (modified) (4 diffs)
• jump/Jump.cc (modified) (20 diffs)
• jump/JumpBoots.cc (modified) (1 diff)
• jump/JumpCenterpoint.cc (modified) (1 diff)
• jump/JumpEnemy.cc (modified) (1 diff)
• jump/JumpFigure.cc (modified) (11 diffs)
• jump/JumpPlatform.cc (modified) (1 diff)
• jump/JumpPlatformTimer.cc (modified) (2 diffs)
• jump/JumpPropeller.cc (modified) (1 diff)
• jump/JumpRocket.cc (modified) (1 diff)
• jump/JumpScore.cc (modified) (5 diffs)
• jump/JumpShield.cc (modified) (1 diff)
• jump/JumpSpring.cc (modified) (1 diff)
• mini4dgame/Mini4Dgame.cc (modified) (3 diffs)
• mini4dgame/Mini4DgameBoard.cc (modified) (1 diff)
• notifications/NotificationDispatcher.cc (modified) (2 diffs)
• notifications/NotificationManager.cc (modified) (2 diffs)
• notifications/NotificationQueueCEGUI.cc (modified) (1 diff)
• objects/Script.cc (modified) (2 diffs)
• objects/SpaceBoundaries.cc (modified) (4 diffs)
• objects/triggers/DistanceMultiTrigger.cc (modified) (4 diffs)
• objects/triggers/DistanceTrigger.cc (modified) (3 diffs)
• objects/triggers/EventMultiTrigger.cc (modified) (1 diff)
• objects/triggers/MultiTrigger.cc (modified) (8 diffs)
• objects/triggers/MultiTrigger.h (modified) (4 diffs)
• objects/triggers/MultiTriggerContainer.cc (modified) (2 diffs)
• objects/triggers/TriggerBase.cc (modified) (3 diffs)
• overlays/GUIOverlay.cc (modified) (1 diff)
• overlays/hud/HUDEnemyHealthBar.cc (modified) (2 diffs)
• overlays/hud/HUDNavigation.cc (modified) (5 diffs)
• pickup/CollectiblePickup.cc (modified) (2 diffs)
• pickup/CollectiblePickup.h (modified) (1 diff)
• pickup/PickupCollection.cc (modified) (3 diffs)
• pickup/PickupManager.cc (modified) (6 diffs)
• pickup/PickupRepresentation.cc (modified) (6 diffs)
• pickup/PickupRepresentation.h (modified) (1 diff)
• pickup/PickupSpawner.cc (modified) (9 diffs)
• pickup/items/DamageBoostPickup.cc (modified) (3 diffs)
• pickup/items/DronePickup.cc (modified) (4 diffs)
• pickup/items/HealthPickup.cc (modified) (5 diffs)
• pickup/items/InvisiblePickup.cc (modified) (3 diffs)
• pickup/items/MetaPickup.cc (modified) (2 diffs)
• pickup/items/ShieldPickup.cc (modified) (3 diffs)
• pickup/items/ShrinkPickup.cc (modified) (9 diffs)
• pickup/items/SpeedPickup.cc (modified) (3 diffs)
• pong/Pong.cc (modified) (14 diffs)
• pong/PongAI.cc (modified) (1 diff)
• pong/PongBall.cc (modified) (3 diffs)
• pong/PongCenterpoint.cc (modified) (1 diff)
• pong/PongScore.cc (modified) (6 diffs)
• portals/PortalEndPoint.cc (modified) (2 diffs)
• questsystem/GlobalQuest.cc (modified) (3 diffs)
• questsystem/LocalQuest.cc (modified) (2 diffs)
• questsystem/Quest.cc (modified) (13 diffs)
• questsystem/QuestEffectBeacon.cc (modified) (3 diffs)
• questsystem/QuestHint.cc (modified) (1 diff)
• questsystem/QuestListener.cc (modified) (3 diffs)
• questsystem/QuestManager.cc (modified) (18 diffs)
• questsystem/effects/AddQuest.cc (modified) (1 diff)
• questsystem/effects/AddQuestHint.cc (modified) (1 diff)
• questsystem/effects/AddReward.cc (modified) (1 diff)
• questsystem/effects/CompleteQuest.cc (modified) (1 diff)
• questsystem/effects/FailQuest.cc (modified) (1 diff)
• tetris/Tetris.cc (modified) (8 diffs)
• tetris/TetrisBrick.cc (modified) (3 diffs)
• tetris/TetrisCenterpoint.cc (modified) (1 diff)
• tetris/TetrisScore.cc (modified) (5 diffs)
• towerdefense/TowerDefense.cc (modified) (11 diffs)
• towerdefense/TowerDefenseCenterpoint.cc (modified) (1 diff)
• towerdefense/TowerDefenseEnemy.cc (modified) (1 diff)
• towerdefense/TowerDefenseField.cc (modified) (14 diffs)
• towerdefense/TowerDefenseTower.cc (modified) (1 diff)
• weapons/IceGunFreezer.cc (modified) (2 diffs)
• weapons/projectiles/BasicProjectile.cc (modified) (2 diffs)
• weapons/projectiles/GravityBombField.cc (modified) (1 diff)
• weapons/projectiles/Projectile.cc (modified) (1 diff)

code/branches/cpp11_v2/src/modules/designtools/ScreenshotManager.cc

@@ -69 +69 @@
         Constructor. 
     */
-    ScreenshotManager::ScreenshotManager() : finalPicturePB_(NULL), data_(NULL)
+    ScreenshotManager::ScreenshotManager() : finalPicturePB_(nullptr), data_(nullptr)
     {
         RegisterObject(ScreenshotManager);
@@ -90 +90 @@
     void ScreenshotManager::cleanup(void)
     {
-        if(this->finalPicturePB_ != NULL)
+        if(this->finalPicturePB_ != nullptr)
         {
             delete this->finalPicturePB_;
-            this->finalPicturePB_ = NULL;
-        }
-        if(this->data_ != NULL)
+            this->finalPicturePB_ = nullptr;
+        }
+        if(this->data_ != nullptr)
         {
             delete this->data_;
-            this->data_ = NULL;
+            this->data_ = nullptr;
         }
         if(!this->tempTexture_.isNull())
@@ -151 +151 @@
         // Get the screenshot.
         Ogre::Image* finalImage = getScreenshot();
-        if(finalImage != NULL)
+        if(finalImage != nullptr)
         {
             // Save it.
@@ -173 +173 @@
     Ogre::Image* ScreenshotManager::getScreenshot()
     {
-        if(CameraManager::getInstance().getActiveCamera() == NULL )
-            return NULL;
+        if(CameraManager::getInstance().getActiveCamera() == nullptr )
+            return nullptr;
         return this->getScreenshot(CameraManager::getInstance().getActiveCamera()->getOgreCamera());
     }
@@ -189 +189 @@
     Ogre::Image* ScreenshotManager::getScreenshot(Ogre::Camera* camera)
     {
-        if(camera == NULL)
-            return NULL;
+        if(camera == nullptr)
+            return nullptr;
         
         // Update the internal parameters.

code/branches/cpp11_v2/src/modules/designtools/SkyboxGenerator.cc

@@ -146 +146 @@
             }
 
-            ControllableEntity* entity = NULL;
-            if(HumanController::getLocalControllerSingleton() != NULL && HumanController::getLocalControllerSingleton()->getControllableEntity() != NULL)
+            ControllableEntity* entity = nullptr;
+            if(HumanController::getLocalControllerSingleton() != nullptr && HumanController::getLocalControllerSingleton()->getControllableEntity() != nullptr)
                 entity = HumanController::getLocalControllerSingleton()->getControllableEntity();
             else

code/branches/cpp11_v2/src/modules/docking/Dock.cc

@@ -87 +87 @@
 
         PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
-        PlayerInfo* player = NULL;
+        PlayerInfo* player = nullptr;
 
         // Check whether it is a player trigger and extract pawn from it
-        if(pTrigger != NULL)
+        if(pTrigger != nullptr)
         {
             if(!pTrigger->isForPlayer()) {  // The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
@@ -103 +103 @@
             return false;
         }
-        if(player == NULL)
+        if(player == nullptr)
         {
             orxout(verbose, context::docking) << "Docking::execute Can't retrieve PlayerInfo from Trigger. (" << trigger->getIdentifier()->getName() << ")" << endl;
@@ -131 +131 @@
     {
         PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
-        PlayerInfo* player = NULL;
+        PlayerInfo* player = nullptr;
 
         // Check whether it is a player trigger and extract pawn from it
-        if(pTrigger != NULL)
+        if(pTrigger != nullptr)
         {
             if(!pTrigger->isForPlayer()) {  // The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
@@ -147 +147 @@
             return false;
         }
-        if(player == NULL)
+        if(player == nullptr)
         {
             orxout(verbose, context::docking) << "Docking::execute Can't retrieve PlayerInfo from Trigger. (" << trigger->getIdentifier()->getName() << ")" << endl;
@@ -315 +315 @@
             }
         }
-        return NULL;
+        return nullptr;
     }
 
@@ -333 +333 @@
             i--;
         }
-        return NULL;
+        return nullptr;
     }
 
@@ -352 +352 @@
             i--;
         }
-        return NULL;
+        return nullptr;
     }
 }

code/branches/cpp11_v2/src/modules/docking/DockToShip.cc

@@ -72 +72 @@
 
         DockingTarget *target = DockingEffect::findTarget(this->target_);
-        if (target == NULL) {
+        if (target == nullptr) {
             orxout(internal_warning, context::docking) << "Can't retrieve target for '" << this->target_ << "'.." << endl;
             return false;
@@ -78 +78 @@
 
         ControllableEntity *dockTo = (ControllableEntity*) target->getParent();
-        if (dockTo == NULL) {
+        if (dockTo == nullptr) {
             orxout(internal_warning, context::docking) << "Parent is not a ControllableEntity.." << endl;
             return false;

code/branches/cpp11_v2/src/modules/docking/DockingAnimation.cc

@@ -45 +45 @@
         RegisterObject(DockingAnimation);
 
-        this->parent_ = NULL;
+        this->parent_ = nullptr;
     }
 

code/branches/cpp11_v2/src/modules/docking/DockingController.cc

@@ -44 +44 @@
         RegisterObject(DockingController);
 
-        this->dock_ = NULL;
-        this->player_ = NULL;
-        this->entity_ = NULL;
+        this->dock_ = nullptr;
+        this->player_ = nullptr;
+        this->entity_ = nullptr;
     }
 
@@ -122 +122 @@
         this->player_->startControl(this->entity_);
         this->setActive(false);
-        this->controllableEntity_ = NULL;
+        this->controllableEntity_ = nullptr;
 
         if (this->docking_)

code/branches/cpp11_v2/src/modules/docking/DockingEffect.cc

@@ -70 +70 @@
                 return (*it);
         }
-        return NULL;
+        return nullptr;
     }
 }

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)

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

@@ -125 +125 @@
             }
         }
-        return NULL;
+        return nullptr;
     }
 

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

@@ -98 +98 @@
                     RaceCheckPoint* point2 = findCheckpoint((*numb));
 
-                    //if(point2 != NULL)
+                    //if(point2 != nullptr)
                     //placeVirtualCheckpoints((*it), point2);
                 }
@@ -126 +126 @@
         staticRacePoints_ = findStaticCheckpoints(nextRaceCheckpoint_, checkpoints);
         // initialisation of currentRaceCheckpoint_
-        currentRaceCheckpoint_ = NULL;
+        currentRaceCheckpoint_ = nullptr;
 
         int i;
-        for (i = -2; findCheckpoint(i) != NULL; i--)
+        for (i = -2; findCheckpoint(i) != nullptr; i--)
         {
             continue;
@@ -194 +194 @@
                     continue;
                 }
-                if (findCheckpoint(*it) == NULL)
+                if (findCheckpoint(*it) == nullptr)
                     orxout(internal_warning) << "Problematic Point: " << (*it) << endl;
                 else
@@ -209 +209 @@
     float SpaceRaceController::distanceSpaceshipToCheckPoint(RaceCheckPoint* CheckPoint)
     {
-        if (this->getControllableEntity() != NULL)
+        if (this->getControllableEntity() != nullptr)
         {
             return (CheckPoint->getPosition()- this->getControllableEntity()->getPosition()).length();
@@ -223 +223 @@
     {
         float minDistance = 0;
-        RaceCheckPoint* minNextRaceCheckPoint = NULL;
+        RaceCheckPoint* minNextRaceCheckPoint = nullptr;
 
         // find the next checkpoint with the minimal distance
@@ -231 +231 @@
             float distance = recCalculateDistance(nextRaceCheckPoint, this->getControllableEntity()->getPosition());
 
-            if (distance < minDistance || minNextRaceCheckPoint == NULL)
+            if (distance < minDistance || minNextRaceCheckPoint == nullptr)
             {
                 minDistance = distance;
@@ -271 +271 @@
     RaceCheckPoint* SpaceRaceController::adjustNextPoint()
     {
-        if (currentRaceCheckpoint_ == NULL) // no Adjust possible
+        if (currentRaceCheckpoint_ == nullptr) // no Adjust possible
 
         {
@@ -292 +292 @@
             if (this->checkpoints_[i]->getCheckpointIndex() == index)
                 return this->checkpoints_[i];
-        return NULL;
+        return nullptr;
     }
 
@@ -347 +347 @@
     void SpaceRaceController::tick(float dt)
     {
-        if (this->getControllableEntity() == NULL || this->getControllableEntity()->getPlayer() == NULL )
+        if (this->getControllableEntity() == nullptr || this->getControllableEntity()->getPlayer() == nullptr )
         {
             //orxout()<< this->getControllableEntity() << " in tick"<<endl;
@@ -419 +419 @@
             {
                 btCollisionShape* currentShape = (*it)->getAttachedCollisionShape(everyShape)->getCollisionShape();
-                if(currentShape == NULL)
+                if(currentShape == nullptr)
                 continue;
 
@@ -447 +447 @@
             {
                 btCollisionShape* currentShape = (*it)->getAttachedCollisionShape(everyShape)->getCollisionShape();
-                if(currentShape == NULL)
+                if(currentShape == nullptr)
                 continue;
 
@@ -491 +491 @@
         {
 
-            if (dynamic_cast<RaceCheckPoint*>(*it) != NULL)
+            if (dynamic_cast<RaceCheckPoint*>(*it) != nullptr)
             {
                 continue;
@@ -537 +537 @@
         //                    btVector3 positionObject;
         //                    btScalar radiusObject;
-        //                    if((*it)==NULL)
+        //                    if((*it)==nullptr)
         //                    {   orxout()<<"Problempoint 1.1"<<endl; continue;}
         //                    //TODO: Probably it points on a wrong object
         //                    for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape)!=0; everyShape++)
         //                    {
-        //                        if((*it)->getAttachedCollisionShape(everyShape)->getCollisionShape()==NULL)
+        //                        if((*it)->getAttachedCollisionShape(everyShape)->getCollisionShape()==nullptr)
         //                        {    continue;}
         //
@@ -570 +570 @@
         //                        btVector3 positionObject;
         //                        btScalar radiusObject;
-        //                        if((*it)==NULL)
+        //                        if((*it)==nullptr)
         //                        {   orxout()<<"Problempoint 1"<<endl; continue;}
         //                        for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape)!=0; everyShape++)
         //                        {
-        //                            if((*it)->getAttachedCollisionShape(everyShape)->getCollisionShape()==NULL)
+        //                            if((*it)->getAttachedCollisionShape(everyShape)->getCollisionShape()==nullptr)
         //                            {   orxout()<<"Problempoint 2.2"<<endl; continue;}
         //                            (*it)->getAttachedCollisionShape(everyShape)->getCollisionShape()->getBoundingSphere(positionObject,radiusObject);

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

@@ -71 +71 @@
         this->players_ = this->race_->getPlayers();
 
-        if (this->checkpoints_[0] != NULL && !this->firstcheckpointvisible_)
+        if (this->checkpoints_[0] != nullptr && !this->firstcheckpointvisible_)
         {
             this->checkpoints_[0]->setRadarVisibility(true);
@@ -121 +121 @@
     bool SpaceRaceManager::reachedValidCheckpoint(RaceCheckPoint* oldCheckpoint, RaceCheckPoint* newCheckpoint, PlayerInfo* player) const
     {
-        if (oldCheckpoint != NULL)
+        if (oldCheckpoint != nullptr)
         {
             // the player already visited an old checkpoint; see which checkpoints are possible now

code/branches/cpp11_v2/src/modules/invader/Invader.cc

@@ -78 +78 @@
     {
         level++;
-        if (getPlayer() != NULL)
+        if (getPlayer() != nullptr)
         {
             for (int i = 0; i < 7; i++)
@@ -96 +96 @@
     InvaderShip* Invader::getPlayer()
     {
-        if (player == NULL)
+        if (player == nullptr)
         {
             for (ObjectList<InvaderShip>::iterator it = ObjectList<InvaderShip>::begin(); it != ObjectList<InvaderShip>::end(); ++it)
@@ -106 +106 @@
     void Invader::spawnEnemy()
     {
-        if (getPlayer() == NULL)
+        if (getPlayer() == nullptr)
             return;
 
@@ -158 +158 @@
         this->bForceSpawn_ = true;
 
-        if (this->center_ == NULL)  // abandon mission!
+        if (this->center_ == nullptr)  // abandon mission!
         {
             orxout(internal_error) << "Invader: No Centerpoint specified." << endl;

code/branches/cpp11_v2/src/modules/invader/InvaderCenterPoint.cc

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

code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.cc

@@ -56 +56 @@
             removeHealth(2000);
 
-        if (player != NULL)
+        if (player != nullptr)
         {
             float newZ = 2/(pow(abs(getPosition().x - player->getPosition().x) * 0.01f, 2) + 1) * (player->getPosition().z - getPosition().z);
@@ -73 +73 @@
     Invader* InvaderEnemy::getGame()
     {
-        if (game == NULL)
+        if (game == nullptr)
         {
             for (ObjectList<Invader>::iterator it = ObjectList<Invader>::begin(); it != ObjectList<Invader>::end(); ++it)
@@ -84 +84 @@
     {
         Pawn::damage(damage, healthdamage, shielddamage, originator, cs);
-        if (getGame() && orxonox_cast<InvaderShip*>(originator) != NULL && getHealth() <= 0)
+        if (getGame() && orxonox_cast<InvaderShip*>(originator) != nullptr && getHealth() <= 0)
             getGame()->addPoints(42);
     }

code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.cc

@@ -59 +59 @@
             removeHealth(2000);
 
-        if (player != NULL)
+        if (player != nullptr)
         {
             float distPlayer = player->getPosition().z - getPosition().z;
@@ -77 +77 @@
     {
         Pawn::damage(damage, healthdamage, shielddamage, originator, cs);
-        if (getGame() && orxonox_cast<InvaderShip*>(originator) != NULL && getHealth() <= 0)
+        if (getGame() && orxonox_cast<InvaderShip*>(originator) != nullptr && getHealth() <= 0)
             getGame()->addPoints(3*42);
     }

code/branches/cpp11_v2/src/modules/invader/InvaderShip.cc

@@ -95 +95 @@
         // Camera
         Camera* camera = this->getCamera();
-        if (camera != NULL)
+        if (camera != nullptr)
         {
             camera->setPosition(Vector3(-pos.z, -posforeward, 0));
@@ -154 +154 @@
         Projectile* shot = orxonox_cast<Projectile*>(otherObject);
         // ensure that this gets only called once per enemy.
-        if (enemy != NULL && lastEnemy != enemy)
+        if (enemy != nullptr && lastEnemy != enemy)
         {
             lastEnemy = enemy;
@@ -165 +165 @@
         }
         // was shot, decrease multiplier
-        else if (shot != NULL  && lastShot != shot)
+        else if (shot != nullptr  && lastShot != shot)
         {
-            if (getGame() && orxonox_cast<InvaderEnemy*>(shot->getShooter()) != NULL)
+            if (getGame() && orxonox_cast<InvaderEnemy*>(shot->getShooter()) != nullptr)
             {
                 if (getGame()->multiplier > 1)
@@ -182 +182 @@
     Invader* InvaderShip::getGame()
     {
-        if (game == NULL)
+        if (game == nullptr)
         {
             for (ObjectList<Invader>::iterator it = ObjectList<Invader>::begin(); it != ObjectList<Invader>::end(); ++it)

code/branches/cpp11_v2/src/modules/jump/Jump.cc

@@ -83 +83 @@
         SUPER(Jump, tick, dt);
 
-        if (figure_ != NULL)
+        if (figure_ != nullptr)
         {
             Vector3 figurePosition = figure_->getPosition();
@@ -130 +130 @@
 
 
-            if (camera != NULL)
+            if (camera != nullptr)
             {
                 Vector3 cameraPosition = Vector3(0, totalScreenShift_, 0);
@@ -275 +275 @@
     void Jump::start()
     {
-        if (center_ != NULL) // There needs to be a JumpCenterpoint, i.e. the area the game takes place.
-        {
-            if (figure_ == NULL)
+        if (center_ != nullptr) // There needs to be a JumpCenterpoint, i.e. the area the game takes place.
+        {
+            if (figure_ == nullptr)
             {
                 figure_ = new JumpFigure(center_->getContext());
@@ -298 +298 @@
         Deathmatch::start();
 
-        if (figure_ != NULL)
+        if (figure_ != nullptr)
         {
             camera = figure_->getCamera();
@@ -325 +325 @@
         assert(player);
 
-        if (figure_->getPlayer() == NULL)
+        if (figure_->getPlayer() == nullptr)
         {
             player->startControl(figure_);
@@ -334 +334 @@
     PlayerInfo* Jump::getPlayer() const
     {
-        if (this->figure_ != NULL)
+        if (this->figure_ != nullptr)
         {
             return this->figure_->getPlayer();
@@ -346 +346 @@
     void Jump::addPlatform(JumpPlatform* newPlatform, std::string platformTemplate, float xPosition, float zPosition)
     {
-        if (newPlatform != NULL && center_ != NULL)
+        if (newPlatform != nullptr && center_ != nullptr)
         {
             newPlatform->addTemplate(platformTemplate);
@@ -414 +414 @@
     {
         JumpProjectile* newProjectile = new JumpProjectile(center_->getContext());
-        if (newProjectile != NULL && center_ != NULL)
+        if (newProjectile != nullptr && center_ != nullptr)
         {
             newProjectile->addTemplate(center_->getProjectileTemplate());
@@ -427 +427 @@
     {
         JumpSpring* newSpring = new JumpSpring(center_->getContext());
-        if (newSpring != NULL && center_ != NULL)
+        if (newSpring != nullptr && center_ != nullptr)
         {
             newSpring->addTemplate(center_->getSpringTemplate());
@@ -440 +440 @@
     {
         JumpSpring* newSpring = new JumpSpring(center_->getContext());
-        if (newSpring != NULL && center_ != NULL)
+        if (newSpring != nullptr && center_ != nullptr)
         {
             newSpring->addTemplate(center_->getSpringTemplate());
@@ -453 +453 @@
     {
         JumpRocket* newRocket = new JumpRocket(center_->getContext());
-        if (newRocket != NULL && center_ != NULL)
+        if (newRocket != nullptr && center_ != nullptr)
         {
             newRocket->addTemplate(center_->getRocketTemplate());
@@ -466 +466 @@
     {
         JumpRocket* newRocket = new JumpRocket(center_->getContext());
-        if (newRocket != NULL && center_ != NULL)
+        if (newRocket != nullptr && center_ != nullptr)
         {
             newRocket->addTemplate(center_->getRocketTemplate());
@@ -479 +479 @@
     {
         JumpPropeller* newPropeller = new JumpPropeller(center_->getContext());
-        if (newPropeller != NULL && center_ != NULL)
+        if (newPropeller != nullptr && center_ != nullptr)
         {
             newPropeller->addTemplate(center_->getPropellerTemplate());
@@ -492 +492 @@
     {
         JumpPropeller* newPropeller = new JumpPropeller(center_->getContext());
-        if (newPropeller != NULL && center_ != NULL)
+        if (newPropeller != nullptr && center_ != nullptr)
         {
             newPropeller->addTemplate(center_->getPropellerTemplate());
@@ -505 +505 @@
     {
         JumpBoots* newBoots = new JumpBoots(center_->getContext());
-        if (newBoots != NULL && center_ != NULL)
+        if (newBoots != nullptr && center_ != nullptr)
         {
             newBoots->addTemplate(center_->getBootsTemplate());
@@ -518 +518 @@
     {
         JumpBoots* newBoots = new JumpBoots(center_->getContext());
-        if (newBoots != NULL && center_ != NULL)
+        if (newBoots != nullptr && center_ != nullptr)
         {
             newBoots->addTemplate(center_->getBootsTemplate());
@@ -531 +531 @@
     {
         JumpShield* newShield = new JumpShield(center_->getContext());
-        if (newShield != NULL && center_ != NULL)
+        if (newShield != nullptr && center_ != nullptr)
         {
             newShield->addTemplate(center_->getShieldTemplate());
@@ -544 +544 @@
     {
         JumpShield* newShield = new JumpShield(center_->getContext());
-        if (newShield != NULL && center_ != NULL)
+        if (newShield != nullptr && center_ != nullptr)
         {
             newShield->addTemplate(center_->getShieldTemplate());
@@ -557 +557 @@
     {
         JumpEnemy* newEnemy = new JumpEnemy(center_->getContext());
-        if (newEnemy != NULL && center_ != NULL)
+        if (newEnemy != nullptr && center_ != nullptr)
         {
             switch (type)
@@ -1270 +1270 @@
     float Jump::getFuel() const
     {
-        if (this->figure_ != NULL)
-        {
-            if (this->figure_->rocketActive_ != NULL)
+        if (this->figure_ != nullptr)
+        {
+            if (this->figure_->rocketActive_ != nullptr)
             {
                 return this->figure_->rocketActive_->getFuelState();
             }
-            else if (this->figure_->propellerActive_ != NULL)
+            else if (this->figure_->propellerActive_ != nullptr)
             {
                 return this->figure_->propellerActive_->getFuelState();
             }
-            else if (this->figure_->shieldActive_ != NULL)
+            else if (this->figure_->shieldActive_ != nullptr)
             {
                 return this->figure_->shieldActive_->getFuelState();
             }
-            else if (this->figure_->bootsActive_ != NULL)
+            else if (this->figure_->bootsActive_ != nullptr)
             {
                 return this->figure_->bootsActive_->getFuelState();

code/branches/cpp11_v2/src/modules/jump/JumpBoots.cc

@@ -72 +72 @@
         Vector3 rocketPosition = getWorldPosition();
 
-        if (attachedToFigure_ == false && figure_ != NULL)
+        if (attachedToFigure_ == false && figure_ != nullptr)
         {
             Vector3 figurePosition = figure_->getWorldPosition();

code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.cc

@@ -83 +83 @@
     void JumpCenterpoint::checkGametype()
     {
-        if (getGametype() != NULL && this->getGametype()->isA(Class(Jump)))
+        if (getGametype() != nullptr && this->getGametype()->isA(Class(Jump)))
         {
             Jump* jumpGametype = orxonox_cast<Jump*>(this->getGametype());

code/branches/cpp11_v2/src/modules/jump/JumpEnemy.cc

@@ -119 +119 @@
         Vector3 enemyPosition = getPosition();
 
-        if (figure_ != NULL)
+        if (figure_ != nullptr)
         {
             Vector3 figurePosition = figure_->getPosition();

code/branches/cpp11_v2/src/modules/jump/JumpFigure.cc

@@ -51 +51 @@
 
         // initialize variables
-        leftHand_ = NULL;
-        rightHand_ = NULL;
+        leftHand_ = nullptr;
+        rightHand_ = nullptr;
         fieldHeight_ = 0;
         fieldWidth_ = 0;
@@ -75 +75 @@
         animateHands_ = false;
         turnUp_ = false;
-        rocketActive_ = NULL;
-        propellerActive_ = NULL;
-        bootsActive_ = NULL;
-        shieldActive_ = NULL;
+        rocketActive_ = nullptr;
+        propellerActive_ = nullptr;
+        bootsActive_ = nullptr;
+        shieldActive_ = nullptr;
         rocketSpeed_ = 0.0;
         propellerSpeed_ = 0.0;
@@ -111 +111 @@
             // Move up/down
             Vector3 velocity = getVelocity();
-            if (rocketActive_ != NULL)
+            if (rocketActive_ != nullptr)
             {
                 velocity.z = rocketSpeed_;
             }
-            else if (propellerActive_ != NULL)
+            else if (propellerActive_ != nullptr)
             {
                 velocity.z = propellerSpeed_;
@@ -144 +144 @@
                 }
 
-                if (leftHand_ != NULL)
+                if (leftHand_ != nullptr)
                 {
                     leftHand_->setOrientation(Vector3(0.0, 1.0, 0.0), Degree(-handAngle_));
                 }
-                if (rightHand_ != NULL)
+                if (rightHand_ != nullptr)
                 {
                     rightHand_->setOrientation(Vector3(0.0, 1.0, 0.0), Degree(handAngle_));
@@ -212 +212 @@
         {
             Vector3 velocity = getVelocity();
-            if (bootsActive_ == NULL)
+            if (bootsActive_ == nullptr)
             {
                 velocity.z = 1.2f*jumpSpeed_;
@@ -239 +239 @@
     void JumpFigure::CollisionWithEnemy(JumpEnemy* enemy)
     {
-        if (rocketActive_ == NULL && propellerActive_ == NULL && shieldActive_ == NULL)
+        if (rocketActive_ == nullptr && propellerActive_ == nullptr && shieldActive_ == nullptr)
         {
             dead_ = true;
@@ -247 +247 @@
     bool JumpFigure::StartRocket(JumpRocket* rocket)
     {
-        if (rocketActive_ == NULL && propellerActive_ == NULL && bootsActive_ == NULL)
+        if (rocketActive_ == nullptr && propellerActive_ == nullptr && bootsActive_ == nullptr)
         {
             attach(rocket);
@@ -266 +266 @@
         detach(rocket);
         rocket->destroy();
-        rocketActive_ = NULL;
+        rocketActive_ = nullptr;
     }
 
     bool JumpFigure::StartPropeller(JumpPropeller* propeller)
     {
-        if (rocketActive_ == NULL && propellerActive_ == NULL && bootsActive_ == NULL)
+        if (rocketActive_ == nullptr && propellerActive_ == nullptr && bootsActive_ == nullptr)
         {
             attach(propeller);
@@ -290 +290 @@
         detach(propeller);
         propeller->destroy();
-        propellerActive_ = NULL;
+        propellerActive_ = nullptr;
     }
 
     bool JumpFigure::StartBoots(JumpBoots* boots)
     {
-        if (rocketActive_ == NULL && propellerActive_ == NULL && bootsActive_ == NULL)
+        if (rocketActive_ == nullptr && propellerActive_ == nullptr && bootsActive_ == nullptr)
         {
             attach(boots);
@@ -314 +314 @@
         detach(boots);
         boots->destroy();
-        bootsActive_ = NULL;
+        bootsActive_ = nullptr;
     }
 
@@ -338 +338 @@
         detach(shield);
         shield->destroy();
-        shieldActive_ = NULL;
+        shieldActive_ = nullptr;
     }
 

code/branches/cpp11_v2/src/modules/jump/JumpPlatform.cc

@@ -86 +86 @@
         Vector3 platformPosition = this->getPosition();
 
-        if (figure_ != NULL)
+        if (figure_ != nullptr)
         {
             Vector3 figurePosition = figure_->getPosition();

code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.cc

@@ -47 +47 @@
         RegisterObject(JumpPlatformTimer);
 
-        particleSpawner_ = NULL;
+        particleSpawner_ = nullptr;
 
         setProperties(3.0);
@@ -71 +71 @@
 
         time_ -= dt;
-        if (time_ < effectStartTime_ && particleSpawner_ == NULL)
+        if (time_ < effectStartTime_ && particleSpawner_ == nullptr)
         {
 

code/branches/cpp11_v2/src/modules/jump/JumpPropeller.cc

@@ -72 +72 @@
         Vector3 PropellerPosition = getWorldPosition();
 
-        if (attachedToFigure_ == false && figure_ != NULL)
+        if (attachedToFigure_ == false && figure_ != nullptr)
         {
             Vector3 figurePosition = figure_->getWorldPosition();

code/branches/cpp11_v2/src/modules/jump/JumpRocket.cc

@@ -72 +72 @@
         Vector3 rocketPosition = getWorldPosition();
 
-        if (attachedToFigure_ == false && figure_ != NULL)
+        if (attachedToFigure_ == false && figure_ != nullptr)
         {
             Vector3 figurePosition = figure_->getWorldPosition();

code/branches/cpp11_v2/src/modules/jump/JumpScore.cc

@@ -48 +48 @@
         RegisterObject(JumpScore);
 
-        owner_ = NULL;
+        owner_ = nullptr;
         showScore_ = false;
         showFuel_ = false;
@@ -73 +73 @@
         SUPER(JumpScore, tick, dt);
 
-        if (owner_ != NULL)
+        if (owner_ != nullptr)
         {
             if (!owner_->hasEnded())
@@ -79 +79 @@
                 player_ = owner_->getPlayer();
 
-                if (player_ != NULL)
+                if (player_ != nullptr)
                 {
                     if (showScore_ == true)
@@ -116 +116 @@
         SUPER(JumpScore, changedOwner);
 
-        if (this->getOwner() != NULL && this->getOwner()->getGametype())
+        if (this->getOwner() != nullptr && this->getOwner()->getGametype())
         {
             this->owner_ = orxonox_cast<Jump*>(this->getOwner()->getGametype());
@@ -122 +122 @@
         else
         {
-            this->owner_ = NULL;
+            this->owner_ = nullptr;
         }
     }

code/branches/cpp11_v2/src/modules/jump/JumpShield.cc

@@ -72 +72 @@
         Vector3 shieldPosition = getWorldPosition();
 
-        if (attachedToFigure_ == false && figure_ != NULL)
+        if (attachedToFigure_ == false && figure_ != nullptr)
         {
             Vector3 figurePosition = figure_->getWorldPosition();

code/branches/cpp11_v2/src/modules/jump/JumpSpring.cc

@@ -77 +77 @@
         Vector3 springPosition = getWorldPosition();
 
-        if (figure_ != NULL)
+        if (figure_ != nullptr)
         {
             Vector3 figurePosition = figure_->getWorldPosition();

code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.cc

@@ -88 +88 @@
     void Mini4Dgame::cleanup()
     {
-        if(this->board_ != NULL)// Destroy the board, if present.
+        if(this->board_ != nullptr)// Destroy the board, if present.
         {
             //this->board_->destroy();
@@ -101 +101 @@
     void Mini4Dgame::start()
     {
-        if (this->board_ != NULL) // There needs to be a Mini4DgameCenterpoint, i.e. the area the game takes place.
+        if (this->board_ != nullptr) // There needs to be a Mini4DgameCenterpoint, i.e. the area the game takes place.
         {
             /*
-            if (this->board_ == NULL)
+            if (this->board_ == nullptr)
             {
                 this->board_ = new Mini4DgameBoard(this->board_->getContext());
@@ -174 +174 @@
         assert(player);
 
-        if(false)//this->player_ == NULL)
+        if(false)//this->player_ == nullptr)
         {
             //this->player_ = player;

code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameBoard.cc

@@ -905 +905 @@
     void Mini4DgameBoard::checkGametype()
     {
-        if (this->getGametype() != NULL && this->getGametype()->isA(Class(Mini4Dgame)))
+        if (this->getGametype() != nullptr && this->getGametype()->isA(Class(Mini4Dgame)))
         {
             Mini4Dgame* Mini4DgameGametype = orxonox_cast<Mini4Dgame*>(this->getGametype());

code/branches/cpp11_v2/src/modules/notifications/NotificationDispatcher.cc

@@ -177 +177 @@
 
         PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
-        PlayerInfo* player = NULL;
+        PlayerInfo* player = nullptr;
 
         // If the trigger is a PlayerTrigger.
-        if(pTrigger != NULL)
+        if(pTrigger != nullptr)
         {
             if(!pTrigger->isForPlayer())  // The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
@@ -190 +190 @@
             return false;
 
-        if(player == NULL)
+        if(player == nullptr)
         {
             orxout(verbose, context::notifications) << "The NotificationDispatcher was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << endl;

code/branches/cpp11_v2/src/modules/notifications/NotificationManager.cc

@@ -334 +334 @@
         // If all senders are the target of the NotificationQueue, then the list of Notifications for that specific NotificationQueue is the same as the list of all Notifications.
         bool bAll = set.find(NotificationListener::ALL) != set.end();
-        std::multimap<std::time_t, Notification*>* map = NULL;
+        std::multimap<std::time_t, Notification*>* map = nullptr;
         if(bAll)
             this->notificationLists_[queue->getName()] = &this->allNotificationsList_;
@@ -395 +395 @@
         The name of the NotificationQueue.
     @return
-        Returns a pointer to the NotificationQueue with the input name. Returns NULL if no NotificationQueue with such a name exists.
+        Returns a pointer to the NotificationQueue with the input name. Returns nullptr if no NotificationQueue with such a name exists.
     */
     NotificationQueue* NotificationManager::getQueue(const std::string & name)
     {
         std::map<const std::string, NotificationQueue*>::iterator it = this->queues_.find(name);
-        // Returns NULL if no such NotificationQueue exists.
+        // Returns nullptr if no such NotificationQueue exists.
         if(it == this->queues_.end())
-            return NULL;
+            return nullptr;
 
         return (*it).second;

code/branches/cpp11_v2/src/modules/notifications/NotificationQueueCEGUI.cc

@@ -290 +290 @@
         The name of the NotificationQueueCEGUI to be got.
     @return
-        Returns a pointer to the NotificationQueueCEGUI, or NULL if it doesn't exist.
+        Returns a pointer to the NotificationQueueCEGUI, or nullptr if it doesn't exist.
     */
     /*static*/ NotificationQueueCEGUI* NotificationQueueCEGUI::getQueue(const std::string& name)
     {
         NotificationQueue* queue = NotificationManager::getInstance().getQueue(name);
-        if(queue == NULL || !queue->isA(Class(NotificationQueueCEGUI)))
-            return NULL;
+        if(queue == nullptr || !queue->isA(Class(NotificationQueueCEGUI)))
+            return nullptr;
         return static_cast<NotificationQueueCEGUI*>(queue);
     }

code/branches/cpp11_v2/src/modules/objects/Script.cc

@@ -140 +140 @@
 
         PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
-        PlayerInfo* player = NULL;
+        PlayerInfo* player = nullptr;
 
         // If the trigger is a PlayerTrigger.
-        if(pTrigger != NULL)
+        if(pTrigger != nullptr)
         {
             if(!pTrigger->isForPlayer())  // The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
@@ -153 +153 @@
             return false;
 
-        if(player == NULL)  //TODO: Will this ever happen? If not, change in NotificationDispatcher as well.
+        if(player == nullptr)  //TODO: Will this ever happen? If not, change in NotificationDispatcher as well.
         {
             orxout(internal_warning) << "The Script was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << endl;

code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.cc

@@ -61 +61 @@
             for( std::vector<BillboardAdministration>::iterator current = this->billboards_.begin(); current != this->billboards_.end(); current++)
             {
-                if( current->billy != NULL)
+                if( current->billy != nullptr)
                 {
                     delete current->billy;
@@ -127 +127 @@
     void SpaceBoundaries::setBillboardOptions(Billboard *billy)
     {
-        if(billy != NULL)
+        if(billy != nullptr)
         {
             billy->setMaterial("Grid");
@@ -250 +250 @@
     float SpaceBoundaries::computeDistance(WorldEntity *item)
     {
-        if(item != NULL)
+        if(item != nullptr)
         {
             Vector3 itemPosition = item->getWorldPosition();
@@ -310 +310 @@
     bool SpaceBoundaries::isHumanPlayer(Pawn *item)
     {
-        if(item != NULL)
+        if(item != nullptr)
         {
             if(item->getPlayer())

code/branches/cpp11_v2/src/modules/objects/triggers/DistanceMultiTrigger.cc

@@ -97 +97 @@
     {
 
-        std::queue<MultiTriggerState*>* queue = NULL;
+        std::queue<MultiTriggerState*>* queue = nullptr;
 
         // Check for objects that were in range but no longer are. Iterate through all objects, that are in range.
@@ -105 +105 @@
 
             // If the entity no longer exists.
-            if(entity == NULL)
+            if(entity == nullptr)
             {
                 this->range_.erase(it++);
@@ -118 +118 @@
 
                 // If no queue has been created, yet.
-                if(queue == NULL)
+                if(queue == nullptr)
                     queue = new std::queue<MultiTriggerState*>();
 
@@ -186 +186 @@
 
                 // If no queue has been created, yet.
-                if(queue == NULL)
+                if(queue == nullptr)
                     queue = new std::queue<MultiTriggerState*>();
 

code/branches/cpp11_v2/src/modules/objects/triggers/DistanceTrigger.cc

@@ -106 +106 @@
             this->setForPlayer(true);
 
-        if (targetId == NULL)
+        if (targetId == nullptr)
         {
             orxout(internal_error, context::triggers) << "\"" << targetStr << "\" is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ')' << endl;
@@ -147 +147 @@
     {
         // Check whether there is a cached object, it still exists and whether it is still in range, if so nothing further needs to be done.
-        if(this->cache_ != NULL)
+        if(this->cache_ != nullptr)
         {
             if((this->cache_->getWorldPosition() - this->getWorldPosition()).length() < this->distance_)
@@ -206 +206 @@
 
                     Pawn* pawn = orxonox_cast<Pawn*>(entity);
-                    if(pawn != NULL)
+                    if(pawn != nullptr)
                         this->setTriggeringPawn(pawn);
                     else
-                        orxout(internal_warning, context::triggers) << "Pawn was NULL." << endl;
+                        orxout(internal_warning, context::triggers) << "Pawn was nullptr." << endl;
                 }
                 

code/branches/cpp11_v2/src/modules/objects/triggers/EventMultiTrigger.cc

@@ -96 +96 @@
     {
         // If the originator is a MultiTriggerContainer, the event originates from a MultiTrigger and thus the event only triggers the EventMultiTrigger for the originator that caused the MultiTrigger to trigger.
-        if(originator != NULL && originator->isA(ClassIdentifier<MultiTriggerContainer>::getIdentifier()))
+        if(originator != nullptr && originator->isA(ClassIdentifier<MultiTriggerContainer>::getIdentifier()))
         {
             MultiTriggerContainer* container = static_cast<MultiTriggerContainer*>(originator);

code/branches/cpp11_v2/src/modules/objects/triggers/MultiTrigger.cc

@@ -124 +124 @@
         // Let the MultiTrigger return the states that trigger and process the new states if there are any.
         std::queue<MultiTriggerState*>* queue  = this->letTrigger();
-        if(queue != NULL)
+        if(queue != nullptr)
         {
             while(queue->size() > 0)
             {
                 MultiTriggerState* state = queue->front();
-                // If the state is NULL. (This really shouldn't happen)
-                if(state == NULL)
+                // If the state is nullptr. (This really shouldn't happen)
+                if(state == nullptr)
                 {
-                    orxout(internal_error, context::triggers) << "In MultiTrigger '" << this->getName() << "' (&" << this << "), Error: State of new states queue was NULL. State ignored." << endl;
+                    orxout(internal_error, context::triggers) << "In MultiTrigger '" << this->getName() << "' (&" << this << "), Error: State of new states queue was nullptr. State ignored." << endl;
                     queue->pop();
                     continue;
@@ -227 +227 @@
                             {
                                 // If the MultiTrigger is set to broadcast and has no originator a boradcast is fired.
-                                if(this->getBroadcast() && state->originator == NULL)
+                                if(this->getBroadcast() && state->originator == nullptr)
                                     this->broadcast(bActive);
                                 // Else a normal event is fired.
@@ -240 +240 @@
                         {
                             // Print some debug output if the state has changed.
-                            if(state->originator != NULL)
+                            if(state->originator != nullptr)
                                 orxout(verbose, context::triggers) << "MultiTrigger '" << this->getName() << "' (&" << this << ") changed state. originator: " << state->originator->getIdentifier()->getName() << " (&" << state->originator << "), active: " << bActive << ", triggered: " << state->bTriggered << "." << endl;
                             else
-                                orxout(verbose, context::triggers) << "MultiTrigger '" << this->getName() << "' (&" << this << ") changed state. originator: NULL, active: " << bActive << ", triggered: " << state->bTriggered << "." << endl;
+                                orxout(verbose, context::triggers) << "MultiTrigger '" << this->getName() << "' (&" << this << ") changed state. originator: nullptr, active: " << bActive << ", triggered: " << state->bTriggered << "." << endl;
 
                             // If the MultiTrigger has a parent trigger, that is itself a MultiTrigger, it needs to call a method to notify him, that its activity has changed.
-                            if(this->parent_ != NULL && this->parent_->isMultiTrigger())
+                            if(this->parent_ != nullptr && this->parent_->isMultiTrigger())
                                 static_cast<MultiTrigger*>(this->parent_)->childActivityChanged(state->originator);
                         }
@@ -299 +299 @@
 
         // If the target is not a valid class name display an error.
-        if (target == NULL)
+        if (target == nullptr)
         {
             orxout(internal_error, context::triggers) << "'" << targetStr << "' is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ")" << endl;
@@ -327 +327 @@
 
         // If the target is not a valid class name display an error.
-        if (target == NULL)
+        if (target == nullptr)
         {
             orxout(internal_error, context::triggers) << "'" << targetStr << "' is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ")" << endl;
@@ -346 +346 @@
     std::queue<MultiTriggerState*>* MultiTrigger::letTrigger(void)
     {
-        return NULL;
+        return nullptr;
     }
 
@@ -443 +443 @@
     void MultiTrigger::fire(bool status, BaseObject* originator)
     {
-        // If the originator is NULL, a normal event without MultiTriggerContainer is sent.
-        if(originator == NULL)
+        // If the originator is nullptr, a normal event without MultiTriggerContainer is sent.
+        if(originator == nullptr)
         {
             this->fireEvent(status);
@@ -479 +479 @@
     bool MultiTrigger::addState(MultiTriggerState* state)
     {
-        assert(state); // The state really shouldn't be NULL.
+        assert(state); // The state really shouldn't be nullptr.
 
         // If the originator is no target of this MultiTrigger.

code/branches/cpp11_v2/src/modules/objects/triggers/MultiTrigger.h

@@ -76 +76 @@
         - @b simultaneousTriggerers The number of simultaneous triggerers limits the number of objects that are allowed to trigger the MultiTrigger at the same time. Or more precisely, the number of distinct objects the MultiTrigger has <em>triggered</em> states for, at each point in time. The default is <code>-1</code>, which denotes infinity.
         - @b mode The mode describes how the MultiTrigger acts in relation to all the triggers, that are appended to it. There are 3 modes: <em>and</em>, meaning that the MultiTrigger can only be triggered if all the appended triggers are active. <em>or</em>, meaning that the MultiTrigger can only triggered if at least one of the appended triggers is active. And <em>xor</em>, meaning that the MultiTrigger can only be triggered if one and only one appended trigger is active. Note, that I wrote <em>can only be active</em>, that implies, that there is an additional condition to the <em>activity</em> of the MultiTrigger and that is the fulfillment of the triggering condition (the MultiTrigger itself doesn't have one, but all derived classes should). Also bear in mind, that the <em>activity</em> of a MultiTrigger is still coupled to the object that triggered it. The default is <em>and</em>.
-        - @b broadcast Broadcast is a boolean, if true the MutliTrigger is in <em>broadcast-mode</em>, meaning, that all trigger events that are caused by no originator (originator is NULL) are broadcast as having come from every possible originator, or more precisely as having come from all objects that are specified targets of this MultiTrigger. The default is false.
+        - @b broadcast Broadcast is a boolean, if true the MutliTrigger is in <em>broadcast-mode</em>, meaning, that all trigger events that are caused by no originator (originator is nullptr) are broadcast as having come from every possible originator, or more precisely as having come from all objects that are specified targets of this MultiTrigger. The default is false.
         - @b target The target describes the kind of objects that are allowed to trigger this MultiTrigger. The default is @ref orxonox::Pawn "Pawn".
         - Also there is the possibility of appending triggers (as long as they inherit from TriggerBase) to the MultiTrigger just by adding them as children in the XML description of your MultiTrigger.
@@ -110 +110 @@
             */
             inline bool isActive(void) const
-                { return this->isActive(NULL); }
-            bool isActive(BaseObject* triggerer = NULL) const; //!< Check whether the MultiTrigger is active for a given object.
+                { return this->isActive(nullptr); }
+            bool isActive(BaseObject* triggerer = nullptr) const; //!< Check whether the MultiTrigger is active for a given object.
 
             /**
@@ -145 +145 @@
             */
             inline bool isTarget(BaseObject* target)
-                { if(target == NULL) return true; else return targetMask_.isIncluded(target->getIdentifier()); }
+                { if(target == nullptr) return true; else return targetMask_.isIncluded(target->getIdentifier()); }
                 
             void addTarget(const std::string& targets); //!< Add some target to the MultiTrigger.
@@ -152 +152 @@
             virtual std::queue<MultiTriggerState*>* letTrigger(void); //!< This method is called by the MultiTrigger to get information about new trigger events that need to be looked at.
 
-            void changeTriggered(BaseObject* originator = NULL); //!< This method can be called by any class inheriting from MultiTrigger to change it's triggered status for a specified originator.
-
-            bool isModeTriggered(BaseObject* triggerer = NULL); //!< Checks whether the MultiTrigger is triggered concerning it's children.
-            bool isTriggered(BaseObject* triggerer = NULL); //!< Get whether the MultiTrigger is triggered for a given object.
-
-            virtual void fire(bool status, BaseObject* originator = NULL);  //!< Helper method. Creates an Event for the given status and originator and fires it.
+            void changeTriggered(BaseObject* originator = nullptr); //!< This method can be called by any class inheriting from MultiTrigger to change it's triggered status for a specified originator.
+
+            bool isModeTriggered(BaseObject* triggerer = nullptr); //!< Checks whether the MultiTrigger is triggered concerning it's children.
+            bool isTriggered(BaseObject* triggerer = nullptr); //!< Get whether the MultiTrigger is triggered for a given object.
+
+            virtual void fire(bool status, BaseObject* originator = nullptr);  //!< Helper method. Creates an Event for the given status and originator and fires it.
             void broadcast(bool status); //!< Helper method. Broadcasts an Event for every object that is a target.
 

code/branches/cpp11_v2/src/modules/objects/triggers/MultiTriggerContainer.cc

@@ -50 +50 @@
         The creator.
     */
-    MultiTriggerContainer::MultiTriggerContainer(Context* context) : BaseObject(context), originator_(NULL), data_(NULL)
+    MultiTriggerContainer::MultiTriggerContainer(Context* context) : BaseObject(context), originator_(nullptr), data_(nullptr)
     {
         RegisterObject(MultiTriggerContainer);
@@ -70 +70 @@
 
         Pawn* pawn = orxonox_cast<Pawn*>(data);
-        if(pawn != NULL)
+        if(pawn != nullptr)
         {
             this->setForPlayer(true);

code/branches/cpp11_v2/src/modules/objects/triggers/TriggerBase.cc

@@ -67 +67 @@
         this->mode_ = TriggerMode::EventTriggerAND;
 
-        this->parent_ = NULL;
+        this->parent_ = nullptr;
 
         this->bMultiTrigger_ = false;
@@ -170 +170 @@
         The index.
     @return
-        Returns a pointer ot the trigger. NULL if no such trigger exists.
+        Returns a pointer ot the trigger. nullptr if no such trigger exists.
     */
     const TriggerBase* TriggerBase::getTrigger(unsigned int index) const
@@ -176 +176 @@
         // If the index is greater than the number of children.
         if (this->children_.size() <= index)
-            return NULL;
+            return nullptr;
 
         std::set<TriggerBase*>::const_iterator it;

code/branches/cpp11_v2/src/modules/overlays/GUIOverlay.cc

@@ -92 +92 @@
             ControllableEntity* entity = orxonox_cast<ControllableEntity*>(this->getOwner());
             if (entity)
-                GUIManager::getInstance().setPlayer(name, entity->getPlayer()); //Set Player is going to be NULL, so it needs to be set in changedVisibility() as well.
+                GUIManager::getInstance().setPlayer(name, entity->getPlayer()); //Set Player is going to be nullptr, so it needs to be set in changedVisibility() as well.
         }
     }

code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc

@@ -62 +62 @@
     void HUDEnemyHealthBar::updateTarget()
     {
-        Pawn* pawn = NULL;
+        Pawn* pawn = nullptr;
         if (this->owner_ && this->useEnemyBar_)
         {
@@ -73 +73 @@
             // Don't show the HealthBar if the pawn is invisible
             if (pawn && !pawn->isVisible())
-                pawn = NULL;
+                pawn = nullptr;
         }
         // Set the pawn as owner of the HealthBar
         this->setHealthBarOwner(pawn);
-        this->setVisible(pawn != NULL);
+        this->setVisible(pawn != nullptr);
     }
 

code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc

@@ -134 +134 @@
         for (std::map<RadarViewable*, ObjectInfo>::iterator it = this->activeObjectList_.begin(); it != this->activeObjectList_.end(); ++it)
         {
-            if (it->second.text_ != NULL)
+            if (it->second.text_ != nullptr)
                 it->second.text_->setFontName(this->fontName_);
         }
@@ -183 +183 @@
 
         Camera* cam = CameraManager::getInstance().getActiveCamera();
-        if (cam == NULL)
+        if (cam == nullptr)
         return;
         const Matrix4& camTransform = cam->getOgreCamera()->getProjectionMatrix() * cam->getOgreCamera()->getViewMatrix();
@@ -476 +476 @@
                     if(!it->second.selected_
                             || it->first->getRVVelocity().squaredLength() == 0
-                            || pawn == NULL
+                            || pawn == nullptr
                             /* TODO : improve getTeam in such a way that it works
-                             * || humanPawn == NULL
+                             * || humanPawn == nullptr
                              * || pawn->getTeam() == humanPawn->getTeam()*/)
                     {
@@ -534 +534 @@
         for (std::map<RadarViewable*, ObjectInfo>::iterator it = this->activeObjectList_.begin(); it != this->activeObjectList_.end(); ++it)
         {
-            if (it->second.health_ != NULL)
+            if (it->second.health_ != nullptr)
                 it->second.health_->setDimensions(this->healthMarkerSize_ * xScale, this->healthMarkerSize_ * yScale);
-            if (it->second.healthLevel_ != NULL)
+            if (it->second.healthLevel_ != nullptr)
                 it->second.healthLevel_->setDimensions(this->healthLevelMarkerSize_ * xScale, this->healthLevelMarkerSize_ * yScale);
-            if (it->second.panel_ != NULL)
+            if (it->second.panel_ != nullptr)
                 it->second.panel_->setDimensions(this->navMarkerSize_ * xScale, this->navMarkerSize_ * yScale);
-            if (it->second.text_ != NULL)
+            if (it->second.text_ != nullptr)
                 it->second.text_->setCharHeight(this->textSize_ * yScale);
-            if (it->second.target_ != NULL)
+            if (it->second.target_ != nullptr)
                 it->second.target_->setDimensions(this->aimMarkerSize_ * xScale, this->aimMarkerSize_ * yScale);
         }
@@ -553 +553 @@
 
         if (this->activeObjectList_.size() >= this->markerLimit_)
-        if (object == NULL)
+        if (object == nullptr)
         return;
 

code/branches/cpp11_v2/src/modules/pickup/CollectiblePickup.cc

@@ -47 +47 @@
         Registers the object and initializes variables.
     */
-    CollectiblePickup::CollectiblePickup() : collection_(NULL)
+    CollectiblePickup::CollectiblePickup() : collection_(nullptr)
     {
         RegisterObject(CollectiblePickup);
@@ -103 +103 @@
     void CollectiblePickup::wasRemovedFromCollection(void)
     {
-        this->collection_ = NULL;
+        this->collection_ = nullptr;
     }
 }

code/branches/cpp11_v2/src/modules/pickup/CollectiblePickup.h

@@ -69 +69 @@
             */
             bool isInCollection(void) const
-                { return this->collection_ != NULL; }
+                { return this->collection_ != nullptr; }
 
         private:

code/branches/cpp11_v2/src/modules/pickup/PickupCollection.cc

@@ -148 +148 @@
         for(std::list<CollectiblePickup*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); ++it)
         {
-            if(this->getCarrier() == NULL)
-                (*it)->setCarrier(NULL);
+            if(this->getCarrier() == nullptr)
+                (*it)->setCarrier(nullptr);
             else
                 (*it)->setCarrier(this->getCarrier()->getTarget(*it));
@@ -227 +227 @@
     bool PickupCollection::addPickupable(CollectiblePickup* pickup)
     {
-        if(pickup == NULL)
+        if(pickup == nullptr)
             return false;
 
@@ -247 +247 @@
     {
         if(this->pickups_.size() >= index)
-            return NULL;
+            return nullptr;
 
         std::list<CollectiblePickup*>::const_iterator it = this->pickups_.begin();

code/branches/cpp11_v2/src/modules/pickup/PickupManager.cc

@@ -68 +68 @@
         Constructor. Registers the PickupManager and creates the default PickupRepresentation.
     */
-    PickupManager::PickupManager() : guiLoaded_(false), pickupHighestIndex_(0), defaultRepresentation_(NULL)
+    PickupManager::PickupManager() : guiLoaded_(false), pickupHighestIndex_(0), defaultRepresentation_(nullptr)
     {
         RegisterObject(PickupManager);
@@ -85 +85 @@
     {
         // Destroying the default representation.
-        if(this->defaultRepresentation_ != NULL)
+        if(this->defaultRepresentation_ != nullptr)
             this->defaultRepresentation_->destroy();
 
@@ -184 +184 @@
         CollectiblePickup* collectible = orxonox_cast<CollectiblePickup*>(pickup);
         // If the Pickupable is part of a PickupCollection it isn't displayed in the PickupInventory, just the PickupCollection is.
-        if(collectible != NULL && collectible->isInCollection())
+        if(collectible != nullptr && collectible->isInCollection())
             return;
 
         // Getting clientId of the host this change of the pickup's used status concerns.
         PickupCarrier* carrier = pickup->getCarrier();
-        while(carrier->getCarrierParent() != NULL)
+        while(carrier->getCarrierParent() != nullptr)
             carrier = carrier->getCarrierParent();
         Pawn* pawn = orxonox_cast<Pawn*>(carrier);
-        if(pawn == NULL)
+        if(pawn == nullptr)
             return;
         PlayerInfo* info = pawn->getPlayer();
-        if(info == NULL)
+        if(info == nullptr)
             return;
         unsigned int clientId = info->getClientID();
@@ -265 +265 @@
         CollectiblePickup* collectible = orxonox_cast<CollectiblePickup*>(pickup);
         // If the Pickupable is part of a PickupCollection it isn't displayed in the PickupInventory, just the PickupCollection is.
-        if(collectible != NULL && collectible->isInCollection())
+        if(collectible != nullptr && collectible->isInCollection())
             return;
 
         // Getting clientId of the host this change of the pickup's pickedUp status concerns.
         PickupCarrier* carrier = pickup->getCarrier();
-        while(carrier->getCarrierParent() != NULL)
+        while(carrier->getCarrierParent() != nullptr)
             carrier = carrier->getCarrierParent();
         Pawn* pawn = orxonox_cast<Pawn*>(carrier);
-        if(pawn == NULL)
+        if(pawn == nullptr)
             return;
         PlayerInfo* info = pawn->getFormerPlayer();
-        if(info == NULL)
+        if(info == nullptr)
             return;
         unsigned int clientId = info->getClientID();
@@ -399 +399 @@
                 return;
             Pickupable* pickupable = this->pickups_.find(pickup)->second;
-            if(pickupable != NULL)
+            if(pickupable != nullptr)
                 pickupable->drop();
         }
@@ -442 +442 @@
                 return;
             Pickupable* pickupable = this->pickups_.find(pickup)->second;
-            if(pickupable != NULL)
+            if(pickupable != nullptr)
                 pickupable->setUsed(use);
         }

code/branches/cpp11_v2/src/modules/pickup/PickupRepresentation.cc

@@ -52 +52 @@
         This is primarily for use of the PickupManager in creating a default PickupRepresentation.
     */
-    PickupRepresentation::PickupRepresentation() : BaseObject(NULL), Synchronisable(NULL), spawnerRepresentation_(NULL)
+    PickupRepresentation::PickupRepresentation() : BaseObject(nullptr), Synchronisable(nullptr), spawnerRepresentation_(nullptr)
     {
         RegisterObject(PickupRepresentation);
@@ -64 +64 @@
         Default Constructor. Registers the object and initializes its member variables.
     */
-    PickupRepresentation::PickupRepresentation(Context* context) : BaseObject(context), Synchronisable(context), spawnerRepresentation_(NULL)
+    PickupRepresentation::PickupRepresentation(Context* context) : BaseObject(context), Synchronisable(context), spawnerRepresentation_(nullptr)
     {
         RegisterObject(PickupRepresentation);
@@ -78 +78 @@
     PickupRepresentation::~PickupRepresentation()
     {
-        if(this->spawnerRepresentation_ != NULL)
+        if(this->spawnerRepresentation_ != nullptr)
             this->spawnerRepresentation_->destroy();
 
@@ -135 +135 @@
     StaticEntity* PickupRepresentation::createSpawnerRepresentation(PickupSpawner* spawner)
     {
-        if(this->spawnerRepresentation_ == NULL)
+        if(this->spawnerRepresentation_ == nullptr)
         {
             orxout(verbose, context::pickups) << "PickupRepresentation: No spawner representation found." << endl;
@@ -149 +149 @@
         this->spawnerRepresentation_->setVisible(true);
         StaticEntity* temp = this->spawnerRepresentation_;
-        this->spawnerRepresentation_ = NULL;
+        this->spawnerRepresentation_ = nullptr;
 
         return temp;
@@ -164 +164 @@
     {
         this->spawnerRepresentation_ = representation;
-        if(this->spawnerRepresentation_ != NULL)
+        if(this->spawnerRepresentation_ != nullptr)
             this->spawnerRepresentation_->setVisible(false);
     }

code/branches/cpp11_v2/src/modules/pickup/PickupRepresentation.h

@@ -119 +119 @@
             @brief Get the StaticEntity that defines how the PickupSpawner of the Pickupable represented by this PickupRepresentation looks like.
             @param index The index.
-            @return Returns (for index = 0) a pointer to the StaticEntity. For index > 0 it returns NULL.
+            @return Returns (for index = 0) a pointer to the StaticEntity. For index > 0 it returns nullptr.
             */
             inline const StaticEntity* getSpawnerRepresentationIndex(unsigned int index) const
-                { if(index == 0) return this->spawnerRepresentation_; return NULL; }
+                { if(index == 0) return this->spawnerRepresentation_; return nullptr; }
             /**
             @brief Get the name of the image representing the pickup in the PickupInventory.

code/branches/cpp11_v2/src/modules/pickup/PickupSpawner.cc

@@ -55 +55 @@
         Pointer to the object which created this item.
     */
-    PickupSpawner::PickupSpawner(Context* context) : StaticEntity(context), pickup_(NULL), representation_(NULL), pickupTemplate_(NULL)
+    PickupSpawner::PickupSpawner(Context* context) : StaticEntity(context), pickup_(nullptr), representation_(nullptr), pickupTemplate_(nullptr)
     {
         RegisterObject(PickupSpawner);
@@ -74 +74 @@
         this->selfDestruct_ = false;
 
-        this->setPickupable(NULL);
+        this->setPickupable(nullptr);
     }
 
@@ -83 +83 @@
     PickupSpawner::~PickupSpawner()
     {
-        if(this->isInitialized() && this->selfDestruct_ && this->pickup_ != NULL)
+        if(this->isInitialized() && this->selfDestruct_ && this->pickup_ != nullptr)
             this->pickup_->destroy();
     }
@@ -160 +160 @@
             for(ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++it)
             {
-                if(spawner == NULL) // Stop if the PickupSpawner has been deleted (e.g. because it has run out of pickups to distribute).
+                if(spawner == nullptr) // Stop if the PickupSpawner has been deleted (e.g. because it has run out of pickups to distribute).
                     break;
 
@@ -166 +166 @@
                 PickupCarrier* carrier = static_cast<PickupCarrier*>(*it);
                 // If a PickupCarrier, that fits the target-range of the Pickupable spawned by this PickupSpawner, is in trigger-distance and the carrier is not blocked.
-                if(distance.length() < this->triggerDistance_ && carrier != NULL && this->blocked_.find(carrier) == this->blocked_.end())
+                if(distance.length() < this->triggerDistance_ && carrier != nullptr && this->blocked_.find(carrier) == this->blocked_.end())
                 {
                     if(carrier->isTarget(this->pickup_))
@@ -195 +195 @@
         pickedUp = false; // To avoid compiler warning.
 
-        this->setPickupable(NULL);
+        this->setPickupable(nullptr);
         this->decrementSpawnsRemaining();
     }
@@ -282 +282 @@
         {
             orxout(internal_error, context::pickups) << "Massive Error: PickupSpawner still alive until having spawned last item." << endl;
-            return NULL;
-        }
-
-        if (this->pickupTemplate_ != NULL)
+            return nullptr;
+        }
+
+        if (this->pickupTemplate_ != nullptr)
         {
             Identifier* identifier = this->pickupTemplate_->getBaseclassIdentifier();
-            if (identifier != NULL)
+            if (identifier != nullptr)
             {
                 Pickupable* pickup = orxonox_cast<Pickupable*>(identifier->fabricate(this->getContext()));
@@ -298 +298 @@
         }
 
-        return NULL;
+        return nullptr;
     }
 
@@ -309 +309 @@
     void PickupSpawner::setPickupable(Pickupable* pickup)
     {
-        if (this->representation_ != NULL)
+        if (this->representation_ != nullptr)
         {
             this->representation_->destroy();
-            this->representation_ = NULL;
-        }
-
-        if (pickup != NULL)
-        {
-            if (this->pickup_ != NULL)
+            this->representation_ = nullptr;
+        }
+
+        if (pickup != nullptr)
+        {
+            if (this->pickup_ != nullptr)
                 this->pickup_->destroy();
 

code/branches/cpp11_v2/src/modules/pickup/items/DamageBoostPickup.cc

@@ -106 +106 @@
 
         SpaceShip* ship = this->carrierToSpaceShipHelper();
-        if(ship == NULL) // If the PickupCarrier is no SpaceShip, then this pickup is useless and therefore is destroyed.
+        if(ship == nullptr) // If the PickupCarrier is no SpaceShip, then this pickup is useless and therefore is destroyed.
             this->Pickupable::destroy();
 
@@ -152 +152 @@
         Helper to transform the PickupCarrier to a SpaceShip, and throw an error message if the conversion fails.
     @return
-        A pointer to the SpaceShip, or NULL if the conversion failed.
+        A pointer to the SpaceShip, or nullptr if the conversion failed.
     */
     SpaceShip* DamageBoostPickup::carrierToSpaceShipHelper(void)
@@ -159 +159 @@
         SpaceShip* ship = orxonox_cast<SpaceShip*>(carrier);
 
-        if(ship == NULL)
+        if(ship == nullptr)
         {
             orxout(internal_error, context::pickups) << "Invalid PickupCarrier in DamageBoostPickup." << endl;

code/branches/cpp11_v2/src/modules/pickup/items/DronePickup.cc

@@ -122 +122 @@
 
                 Pawn* pawn = this->carrierToPawnHelper();
-                if(pawn == NULL) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
+                if(pawn == nullptr) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
                     this->Pickupable::destroy();
 
@@ -131 +131 @@
                 Controller* controller = drone->getController();
                 DroneController* droneController = orxonox_cast<DroneController*>(controller);
-                if(droneController != NULL)
+                if(droneController != nullptr)
                 {
                     droneController->setOwner(pawn);
@@ -156 +156 @@
         Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
     @return
-        A pointer to the Pawn, or NULL if the conversion failed.
+        A pointer to the Pawn, or nullptr if the conversion failed.
     */
     Pawn* DronePickup::carrierToPawnHelper(void)
@@ -163 +163 @@
         Pawn* pawn = orxonox_cast<Pawn*>(carrier);
 
-        if(pawn == NULL)
+        if(pawn == nullptr)
         {
             orxout(internal_error, context::pickups) << "Invalid PickupCarrier in DronePickup." << endl;

code/branches/cpp11_v2/src/modules/pickup/items/HealthPickup.cc

@@ -114 +114 @@
         {
             Pawn* pawn = this->carrierToPawnHelper();
-            if(pawn == NULL) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
+            if(pawn == nullptr) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
                 this->Pickupable::destroy();
 
@@ -168 +168 @@
             {
                 Pawn* pawn = this->carrierToPawnHelper();
-                if(pawn == NULL) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
+                if(pawn == nullptr) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
                     this->Pickupable::destroy();
 
@@ -206 +206 @@
                 Pawn* pawn = orxonox_cast<Pawn*>(carrier);
 
-                if(pawn == NULL)
+                if(pawn == nullptr)
                 {
                     orxout(internal_error, context::pickups) << "Something went horribly wrong in Health Pickup. PickupCarrier is '" << carrier->getIdentifier()->getName() << "' instead of Pawn." << endl;
@@ -233 +233 @@
         Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
     @return
-        A pointer to the Pawn, or NULL if the conversion failed.
+        A pointer to the Pawn, or nullptr if the conversion failed.
     */
     Pawn* HealthPickup::carrierToPawnHelper(void)
@@ -240 +240 @@
         Pawn* pawn = orxonox_cast<Pawn*>(carrier);
 
-        if(pawn == NULL)
+        if(pawn == nullptr)
             orxout(internal_error, context::pickups) << "Invalid PickupCarrier in HealthPickup." << endl;
 

code/branches/cpp11_v2/src/modules/pickup/items/InvisiblePickup.cc

@@ -139 +139 @@
     {
         Pawn* pawn = this->carrierToPawnHelper();
-        if(pawn == NULL)
+        if(pawn == nullptr)
             return false;
 
@@ -163 +163 @@
         Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
     @return
-        A pointer to the Pawn, or NULL if the conversion failed.
+        A pointer to the Pawn, or nullptr if the conversion failed.
     */
     Pawn* InvisiblePickup::carrierToPawnHelper(void)
@@ -170 +170 @@
         Pawn* pawn = orxonox_cast<Pawn*>(carrier);
 
-        if(pawn == NULL)
+        if(pawn == nullptr)
         {
             orxout(internal_error, context::pickups) << "Invalid PickupCarrier in InvisiblePickup." << endl;

code/branches/cpp11_v2/src/modules/pickup/items/MetaPickup.cc

@@ -107 +107 @@
         {
             PickupCarrier* carrier = this->getCarrier();
-            if(this->getMetaType() != pickupMetaType::none && carrier != NULL)
+            if(this->getMetaType() != pickupMetaType::none && carrier != nullptr)
             {
                 // If the metaType is destroyCarrier, then the PickupCarrier is destroyed.
@@ -121 +121 @@
                 {
                     Pickupable* pickup = (*it);
-                    if(pickup == NULL || pickup == this)
+                    if(pickup == nullptr || pickup == this)
                         continue;
 

code/branches/cpp11_v2/src/modules/pickup/items/ShieldPickup.cc

@@ -99 +99 @@
 
         Pawn* pawn = this->carrierToPawnHelper();
-        if(pawn == NULL)
+        if(pawn == nullptr)
             this->Pickupable::destroy();
 
@@ -143 +143 @@
     Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
     @return
-    A pointer to the Pawn, or NULL if the conversion failed.
+    A pointer to the Pawn, or nullptr if the conversion failed.
     */
     Pawn* ShieldPickup::carrierToPawnHelper(void)
@@ -150 +150 @@
         Pawn* pawn = orxonox_cast<Pawn*>(carrier);
 
-        if(pawn == NULL)
+        if(pawn == nullptr)
         {
             orxout(internal_error, context::pickups) << "Invalid PickupCarrier in ShieldPickup." << endl;

code/branches/cpp11_v2/src/modules/pickup/items/ShrinkPickup.cc

@@ -146 +146 @@
         {
             Pawn* pawn = this->carrierToPawnHelper();
-            if(pawn == NULL) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
+            if(pawn == nullptr) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
             {
                 this->Pickupable::destroy();
@@ -173 +173 @@
                 //TODO: Deploy particle effect.
                 Pawn* pawn = this->carrierToPawnHelper();
-                if(pawn == NULL) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
+                if(pawn == nullptr) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
                     return;
 
@@ -187 +187 @@
                 {
                     CameraPosition* cameraPos = pawn->getCameraPosition(index);
-                    if(cameraPos == NULL)
+                    if(cameraPos == nullptr)
                         continue;
                     cameraPos->setPosition(cameraPos->getPosition()/factor);
@@ -201 +201 @@
                 //TODO: Deploy particle effect.
                 Pawn* pawn = this->carrierToPawnHelper();
-                if(pawn == NULL) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
+                if(pawn == nullptr) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
                     return;
 
@@ -213 +213 @@
                 {
                     CameraPosition* cameraPos = pawn->getCameraPosition(index);
-                    if(cameraPos == NULL)
+                    if(cameraPos == nullptr)
                         continue;
                     cameraPos->setPosition(cameraPos->getPosition()/this->shrinkFactor_);
@@ -237 +237 @@
             {
                 Pawn* pawn = this->carrierToPawnHelper();
-                if(pawn == NULL) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
+                if(pawn == nullptr) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
                 {
                     this->Pickupable::destroy();
@@ -268 +268 @@
                 {
                     CameraPosition* cameraPos = pawn->getCameraPosition(index);
-                    if(cameraPos == NULL)
+                    if(cameraPos == nullptr)
                         continue;
                     cameraPos->setPosition(cameraPos->getPosition()/factor);
@@ -277 +277 @@
             {
                 Pawn* pawn = this->carrierToPawnHelper();
-                if(pawn == NULL) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
+                if(pawn == nullptr) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
                     this->Pickupable::destroy();
 
@@ -309 +309 @@
                 {
                     CameraPosition* cameraPos = pawn->getCameraPosition(index);
-                    if(cameraPos == NULL)
+                    if(cameraPos == nullptr)
                         continue;
                     cameraPos->setPosition(cameraPos->getPosition()/factor);

code/branches/cpp11_v2/src/modules/pickup/items/SpeedPickup.cc

@@ -99 +99 @@
 
         SpaceShip* ship = this->carrierToSpaceShipHelper();
-        if(ship == NULL) // If the PickupCarrier is no SpaceShip, then this pickup is useless and therefore is destroyed.
+        if(ship == nullptr) // If the PickupCarrier is no SpaceShip, then this pickup is useless and therefore is destroyed.
             this->Pickupable::destroy();
 
@@ -143 +143 @@
         Helper to transform the PickupCarrier to a SpaceShip, and throw an error message if the conversion fails.
     @return
-        A pointer to the SpaceShip, or NULL if the conversion failed.
+        A pointer to the SpaceShip, or nullptr if the conversion failed.
     */
     SpaceShip* SpeedPickup::carrierToSpaceShipHelper(void)
@@ -150 +150 @@
         SpaceShip* ship = orxonox_cast<SpaceShip*>(carrier);
 
-        if(ship == NULL)
+        if(ship == nullptr)
         {
             orxout(internal_error, context::pickups) << "Invalid PickupCarrier in SpeedPickup." << endl;

code/branches/cpp11_v2/src/modules/pong/Pong.cc

@@ -103 +103 @@
     void Pong::cleanup()
     {
-        if (this->ball_ != NULL) // Destroy the ball, if present.
+        if (this->ball_ != nullptr) // Destroy the ball, if present.
         {
             this->ball_->destroy();
@@ -112 +112 @@
         for (size_t i = 0; i < 2; ++i)
         {
-            if (this->bat_[0] != NULL)
+            if (this->bat_[0] != nullptr)
             {
                 this->bat_[0]->destroy();
@@ -127 +127 @@
     void Pong::start()
     {
-        if (this->center_ != NULL) // There needs to be a PongCenterpoint, i.e. the area the game takes place.
-        {
-            if (this->ball_ == NULL) // If there is no ball, create a new ball.
+        if (this->center_ != nullptr) // There needs to be a PongCenterpoint, i.e. the area the game takes place.
+        {
+            if (this->ball_ == nullptr) // If there is no ball, create a new ball.
             {
                 this->ball_ = new PongBall(this->center_->getContext());
@@ -147 +147 @@
             for (size_t i = 0; i < 2; ++i)
             {
-                if (this->bat_[i] == NULL)
+                if (this->bat_[i] == nullptr)
                 {
                     this->bat_[i] = new PongBat(this->center_->getContext());
@@ -231 +231 @@
 
         // If the first (left) bat has no player.
-        if (this->bat_[0]->getPlayer() == NULL)
+        if (this->bat_[0]->getPlayer() == nullptr)
         {
             player->startControl(this->bat_[0]);
@@ -237 +237 @@
         }
         // If the second (right) bat has no player.
-        else if (this->bat_[1]->getPlayer() == NULL)
+        else if (this->bat_[1]->getPlayer() == nullptr)
         {
             player->startControl(this->bat_[1]);
@@ -247 +247 @@
 
         // If the player is an AI, it receives a pointer to the ball.
-        if (player->getController() != NULL && player->getController()->isA(Class(PongAI)))
+        if (player->getController() != nullptr && player->getController()->isA(Class(PongAI)))
         {
             PongAI* ai = orxonox_cast<PongAI*>(player->getController());
@@ -262 +262 @@
         Deathmatch::playerScored(player, score);
 
-        if (this->center_ != NULL) // If there is a centerpoint.
+        if (this->center_ != nullptr) // If there is a centerpoint.
         {
             // Fire an event for the player that has scored, to be able to react to it in the level, e.g. by displaying fireworks.
@@ -271 +271 @@
 
             // Also announce, that the player has scored.
-            if (player != NULL)
+            if (player != nullptr)
                 this->gtinfo_->sendAnnounceMessage(player->getName() + " scored");
         }
 
         // If there is a ball present, reset its position, velocity and acceleration.
-        if (this->ball_ != NULL)
+        if (this->ball_ != nullptr)
         {
             this->ball_->setPosition(Vector3::ZERO);
@@ -285 +285 @@
 
         // If there are bats reset them to the middle position.
-        if (this->bat_[0] != NULL && this->bat_[1] != NULL)
+        if (this->bat_[0] != nullptr && this->bat_[1] != nullptr)
         {
             this->bat_[0]->setPosition(-this->center_->getFieldDimension().x / 2, 0, 0);
@@ -292 +292 @@
 
         // If a player gets enough points, he won the game -> end of game
-        PlayerInfo* winningPlayer = NULL;
+        PlayerInfo* winningPlayer = nullptr;
         if (this->getLeftPlayer() && this->getScore(this->getLeftPlayer()) >= scoreLimit_)
             winningPlayer = this->getLeftPlayer();
@@ -314 +314 @@
     void Pong::startBall()
     {
-        if (this->ball_ != NULL && this->center_ != NULL)
+        if (this->ball_ != nullptr && this->center_ != nullptr)
             this->ball_->setSpeed(this->center_->getBallSpeed());
     }
@@ -322 +322 @@
         Get the left player.
     @return
-        Returns a pointer to the player playing on the left. If there is no left player, NULL is returned.
+        Returns a pointer to the player playing on the left. If there is no left player, nullptr is returned.
     */
     PlayerInfo* Pong::getLeftPlayer() const
     {
-        if (this->bat_ != NULL && this->bat_[0] != NULL)
+        if (this->bat_ != nullptr && this->bat_[0] != nullptr)
             return this->bat_[0]->getPlayer();
         else
@@ -336 +336 @@
         Get the right player.
     @return
-        Returns a pointer to the player playing on the right. If there is no right player, NULL is returned.
+        Returns a pointer to the player playing on the right. If there is no right player, nullptr is returned.
     */
     PlayerInfo* Pong::getRightPlayer() const
     {
-        if (this->bat_ != NULL && this->bat_[1] != NULL)
+        if (this->bat_ != nullptr && this->bat_[1] != nullptr)
             return this->bat_[1]->getPlayer();
         else

code/branches/cpp11_v2/src/modules/pong/PongAI.cc

@@ -101 +101 @@
     {
         // If either the ball, or the controllable entity (i.e. the bat) don't exist (or aren't set).
-        if (this->ball_  == NULL || this->getControllableEntity() == NULL)
+        if (this->ball_  == nullptr || this->getControllableEntity() == nullptr)
             return;
 

code/branches/cpp11_v2/src/modules/pong/PongBall.cc

@@ -163 +163 @@
             float distance = 0;
 
-            if (this->bat_ != NULL) // If there are bats.
+            if (this->bat_ != nullptr) // If there are bats.
             {
                 // If the right boundary has been crossed.
-                if (position.x > this->fieldWidth_ / 2 && this->bat_[1] != NULL)
+                if (position.x > this->fieldWidth_ / 2 && this->bat_[1] != nullptr)
                 {
                     // Calculate the distance (in z-direction) between the ball and the center of the bat, weighted by half of the effective length of the bat (with additional 10%)
@@ -195 +195 @@
                 }
                 // If the left boundary has been crossed.
-                else if (position.x < -this->fieldWidth_ / 2 && this->bat_[0] != NULL)
+                else if (position.x < -this->fieldWidth_ / 2 && this->bat_[0] != nullptr)
                 {
                     // Calculate the distance (in z-direction) between the ball and the center of the bat, weighted by half of the effective length of the bat (with additional 10%)
@@ -285 +285 @@
     {
         // Make space for the bats, if they don't exist, yet.
-        if (this->bat_ == NULL)
+        if (this->bat_ == nullptr)
         {
             this->bat_ = new WeakPtr<PongBat>[2];

code/branches/cpp11_v2/src/modules/pong/PongCenterpoint.cc

@@ -84 +84 @@
     void PongCenterpoint::checkGametype()
     {
-        if (this->getGametype() != NULL && this->getGametype()->isA(Class(Pong)))
+        if (this->getGametype() != nullptr && this->getGametype()->isA(Class(Pong)))
         {
             Pong* pongGametype = orxonox_cast<Pong*>(this->getGametype());

code/branches/cpp11_v2/src/modules/pong/PongScore.cc

@@ -97 +97 @@
 
         // If the owner is set. The owner being a Pong game.
-        if (this->owner_ != NULL)
+        if (this->owner_ != nullptr)
         {
             if (!this->owner_->hasEnded())
@@ -113 +113 @@
 
             // Save the name and score of each player as a string.
-            if (player1_ != NULL)
+            if (player1_ != nullptr)
             {
                 name1 = player1_->getName();
                 score1 = multi_cast<std::string>(this->owner_->getScore(player1_));
             }
-            if (player2_ != NULL)
+            if (player2_ != nullptr)
             {
                 name2 = player2_->getName();
@@ -128 +128 @@
             if (this->bShowLeftPlayer_)
             {
-                if (this->bShowName_ && this->bShowScore_ && player1_ != NULL)
+                if (this->bShowName_ && this->bShowScore_ && player1_ != nullptr)
                     output1 = name1 + " - " + score1;
                 else if (this->bShowScore_)
@@ -139 +139 @@
             if (this->bShowRightPlayer_)
             {
-                if (this->bShowName_ && this->bShowScore_ && player2_ != NULL)
+                if (this->bShowName_ && this->bShowScore_ && player2_ != nullptr)
                     output2 = score2 + " - " + name2;
                 else if (this->bShowScore_)
@@ -163 +163 @@
     @brief
         Is called when the owner changes.
-        Sets the owner to NULL, if it is not a pointer to a Pong game.
+        Sets the owner to nullptr, if it is not a pointer to a Pong game.
     */
     void PongScore::changedOwner()
@@ -169 +169 @@
         SUPER(PongScore, changedOwner);
 
-        if (this->getOwner() != NULL && this->getOwner()->getGametype())
+        if (this->getOwner() != nullptr && this->getOwner()->getGametype())
             this->owner_ = orxonox_cast<Pong*>(this->getOwner()->getGametype());
         else

code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.cc

@@ -48 +48 @@
     std::map<unsigned int, PortalEndPoint *> PortalEndPoint::idMap_s;
 
-    PortalEndPoint::PortalEndPoint(Context* context) : StaticEntity(context), RadarViewable(this, static_cast<WorldEntity*>(this)), id_(0), trigger_(NULL), reenterDelay_(0)
+    PortalEndPoint::PortalEndPoint(Context* context) : StaticEntity(context), RadarViewable(this, static_cast<WorldEntity*>(this)), id_(0), trigger_(nullptr), reenterDelay_(0)
     {
         RegisterObject(PortalEndPoint);
@@ -70 +70 @@
     PortalEndPoint::~PortalEndPoint()
     {
-        if(this->isInitialized() && this->trigger_ != NULL)
+        if(this->isInitialized() && this->trigger_ != nullptr)
             delete this->trigger_;
     }

code/branches/cpp11_v2/src/modules/questsystem/GlobalQuest.cc

@@ -138 +138 @@
     bool GlobalQuest::isStartable(const PlayerInfo* player) const
     {
-        if(!(this->getParentQuest() == NULL || this->getParentQuest()->isActive(player)))
+        if(!(this->getParentQuest() == nullptr || this->getParentQuest()->isActive(player)))
             return false;
 
@@ -198 +198 @@
         The status to be set.
     @return
-        Returns false if player is NULL.
+        Returns false if player is nullptr.
     */
     bool GlobalQuest::setStatus(PlayerInfo* player, const QuestStatus::Value & status)
@@ -249 +249 @@
             i--;
         }
-        return NULL;
+        return nullptr;
     }
 

code/branches/cpp11_v2/src/modules/questsystem/LocalQuest.cc

@@ -128 +128 @@
     bool LocalQuest::isStartable(const PlayerInfo* player) const
     {
-        if(!(this->getParentQuest() == NULL || this->getParentQuest()->isActive(player)))
+        if(!(this->getParentQuest() == nullptr || this->getParentQuest()->isActive(player)))
             return false;
 
@@ -188 +188 @@
         The status to be set.
     @return
-        Returns false if player is NULL.
+        Returns false if player is nullptr.
     */
     bool LocalQuest::setStatus(PlayerInfo* player, const QuestStatus::Value & status)

code/branches/cpp11_v2/src/modules/questsystem/Quest.cc

@@ -55 +55 @@
         RegisterObject(Quest);
 
-        this->parentQuest_ = NULL;
+        this->parentQuest_ = nullptr;
     }
 
@@ -183 +183 @@
         The index.
     @return
-        Returns a pointer to the sub-quest at the given index. NULL if there is no element at the given index.
+        Returns a pointer to the sub-quest at the given index. nullptr if there is no element at the given index.
     */
     const Quest* Quest::getSubQuest(unsigned int index) const
@@ -198 +198 @@
         }
 
-        return NULL; // If the index is greater than the number of elements in the list.
+        return nullptr; // If the index is greater than the number of elements in the list.
     }
 
@@ -207 +207 @@
         The index.
     @return
-        Returns a pointer to the QuestHint at the given index. NULL if there is no element at the given index.
+        Returns a pointer to the QuestHint at the given index. nullptr if there is no element at the given index.
     */
     const QuestHint* Quest::getHint(unsigned int index) const
@@ -221 +221 @@
             i--;
         }
-        return NULL; // If the index is greater than the number of elements in the list.
+        return nullptr; // If the index is greater than the number of elements in the list.
     }
 
@@ -230 +230 @@
         The index.
     @return
-        Returns a pointer to the fail QuestEffect at the given index. NULL if there is no element at the given index.
+        Returns a pointer to the fail QuestEffect at the given index. nullptr if there is no element at the given index.
     */
     const QuestEffect* Quest::getFailEffect(unsigned int index) const
@@ -244 +244 @@
             i--;
         }
-        return NULL; // If the index is greater than the number of elements in the list.
+        return nullptr; // If the index is greater than the number of elements in the list.
     }
 
@@ -253 +253 @@
         The index.
     @return
-        Returns a pointer to the complete QuestEffect at the given index. NULL if there is no element at the given index.
+        Returns a pointer to the complete QuestEffect at the given index. nullptr if there is no element at the given index.
     */
     const QuestEffect* Quest::getCompleteEffect(unsigned int index) const
@@ -267 +267 @@
             i--;
         }
-        return NULL; // If the index is greater than the number of elements in the list.
+        return nullptr; // If the index is greater than the number of elements in the list.
     }
 
@@ -280 +280 @@
     bool Quest::isInactive(const PlayerInfo* player) const
     {
-        if(player == NULL)
+        if(player == nullptr)
             return true;
         return this->getStatus(player) == QuestStatus::Inactive;
@@ -295 +295 @@
     bool Quest::isActive(const PlayerInfo* player) const
     {
-        if(player == NULL)
+        if(player == nullptr)
             return false;
         return this->getStatus(player) == QuestStatus::Active;
@@ -310 +310 @@
     bool Quest::isFailed(const PlayerInfo* player) const
     {
-        if(player == NULL)
+        if(player == nullptr)
             return false;
         return this->getStatus(player) == QuestStatus::Failed;
@@ -325 +325 @@
     bool Quest::isCompleted(const PlayerInfo* player) const
     {
-        if(player == NULL)
+        if(player == nullptr)
             return false;
         return this->getStatus(player) == QuestStatus::Completed;

code/branches/cpp11_v2/src/modules/questsystem/QuestEffectBeacon.cc

@@ -113 +113 @@
 
         PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
-        PlayerInfo* player = NULL;
+        PlayerInfo* player = nullptr;
 
         // If the trigger is a PlayerTrigger.
-        if(pTrigger != NULL)
+        if(pTrigger != nullptr)
         {
             if(!pTrigger->isForPlayer())  // The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
@@ -126 +126 @@
             return false;
 
-        if(player == NULL)
+        if(player == nullptr)
         {
             orxout(verbose, context::quests) << "The QuestEffectBeacon was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << endl;
@@ -243 +243 @@
             i--;
         }
-        return NULL;
+        return nullptr;
     }
 

code/branches/cpp11_v2/src/modules/questsystem/QuestHint.cc

@@ -88 +88 @@
     bool QuestHint::isActive(const PlayerInfo* player) const
     {
-        if(player == NULL) // If the player is NULL, the Quest obviously can't be active.
+        if(player == nullptr) // If the player is nullptr, the Quest obviously can't be active.
             return false;
 

code/branches/cpp11_v2/src/modules/questsystem/QuestListener.cc

@@ -59 +59 @@
 
         this->mode_ = QuestListenerMode::All;
-        this->quest_ = NULL;
+        this->quest_ = nullptr;
     }
 
@@ -81 +81 @@
         XMLPortParam(QuestListener, "mode", setMode, getMode, xmlelement, mode);
 
-        if(this->quest_ != NULL)
+        if(this->quest_ != nullptr)
             this->quest_->addListener(this); // Adds the QuestListener to the Quests list of listeners.
 
@@ -117 +117 @@
         this->quest_ = QuestManager::getInstance().findQuest(id); // Find the Quest corresponding to the given questId.
 
-        if(this->quest_ == NULL) // If there is no such Quest.
+        if(this->quest_ == nullptr) // If there is no such Quest.
         {
             ThrowException(Argument, "This is bad! The QuestListener has not found a Quest with a corresponding id..");

code/branches/cpp11_v2/src/modules/questsystem/QuestManager.cc

@@ -93 +93 @@
     bool QuestManager::registerQuest(Quest* quest)
     {
-        if(quest == NULL)
-        {
-            orxout(internal_error, context::quests) << "Quest pointer is NULL." << endl;
+        if(quest == nullptr)
+        {
+            orxout(internal_error, context::quests) << "Quest pointer is nullptr." << endl;
             return false;
         }
@@ -135 +135 @@
     bool QuestManager::registerHint(QuestHint* hint)
     {
-        if(hint == NULL)
-        {
-            orxout(internal_error, context::quests) << "Quest pointer is NULL." << endl;
+        if(hint == nullptr)
+        {
+            orxout(internal_error, context::quests) << "Quest pointer is nullptr." << endl;
             return false;
         }
@@ -173 +173 @@
     @return
         Returns a pointer to the Quest with the input id.
-        Returns NULL if there is no Quest with the given questId.
+        Returns nullptr if there is no Quest with the given questId.
     @throws
         Throws an exception if the given questId is invalid.
@@ -188 +188 @@
         else
         {
-           quest = NULL;
+           quest = nullptr;
            orxout(internal_warning, context::quests) << "The quest with id {" << questId << "} is nowhere to be found." << endl;
         }
@@ -202 +202 @@
     @return
         Returns a pointer to the QuestHint with the input id.
-        Returns NULL if there is no QuestHint with the given hintId.
+        Returns nullptr if there is no QuestHint with the given hintId.
     @throws
         Throws an exception if the given hintId is invalid.
@@ -217 +217 @@
         else
         {
-           hint = NULL;
+           hint = nullptr;
            orxout(internal_warning, context::quests) << "The hint with id {" << hintId << "} is nowhere to be found." << endl;
         }
@@ -237 +237 @@
         for(std::map<std::string, Quest*>::iterator it = this->questMap_.begin(); it != this->questMap_.end(); it++)
         {
-            if(it->second->getParentQuest() == NULL && !it->second->isInactive(player))
+            if(it->second->getParentQuest() == nullptr && !it->second->isInactive(player))
                 numQuests++;
         }
@@ -257 +257 @@
         for(std::map<std::string, Quest*>::iterator it = this->questMap_.begin(); it != this->questMap_.end(); it++)
         {
-            if(it->second->getParentQuest() == NULL && !it->second->isInactive(player) && index-- == 0)
+            if(it->second->getParentQuest() == nullptr && !it->second->isInactive(player) && index-- == 0)
                 return it->second;
         }
-        return NULL;
+        return nullptr;
     }
 
@@ -275 +275 @@
     int QuestManager::getNumSubQuests(Quest* quest, PlayerInfo* player)
     {
-        if(quest == NULL)
+        if(quest == nullptr)
             return this->getNumRootQuests(player);
 
@@ -300 +300 @@
     Quest* QuestManager::getSubQuest(Quest* quest, PlayerInfo* player, int index)
     {
-        if(quest == NULL)
+        if(quest == nullptr)
             return this->getRootQuest(player, index);
 
@@ -309 +309 @@
                 return *it;
         }
-        return NULL;
+        return nullptr;
     }
 
@@ -354 +354 @@
                 return *it;
         }
-        return NULL;
+        return nullptr;
     }
 
@@ -367 +367 @@
     Quest* QuestManager::getParentQuest(Quest* quest)
     {
-        OrxAssert(quest, "The input Quest is NULL.");
+        OrxAssert(quest, "The input Quest is nullptr.");
         return quest->getParentQuest();
     }
@@ -381 +381 @@
     QuestDescription* QuestManager::getDescription(Quest* item)
     {
-        OrxAssert(item, "The input Quest is NULL.");
+        OrxAssert(item, "The input Quest is nullptr.");
         return item->getDescription();
     }
@@ -395 +395 @@
     QuestDescription* QuestManager::getDescription(QuestHint* item)
     {
-        OrxAssert(item, "The input QuestHint is NULL.");
+        OrxAssert(item, "The input QuestHint is nullptr.");
         return item->getDescription();
     }
@@ -409 +409 @@
     const std::string QuestManager::getId(Quest* item) const
     {
-        OrxAssert(item, "The input Quest is NULL.");
+        OrxAssert(item, "The input Quest is nullptr.");
         return item->getId();
     }
@@ -423 +423 @@
     const std::string QuestManager::getId(QuestHint* item) const
     {
-        OrxAssert(item, "The input QuestHint is NULL.");
+        OrxAssert(item, "The input QuestHint is nullptr.");
         return item->getId();
     }
@@ -440 +440 @@
     {
         PlayerInfo* player = GUIManager::getInstance().getPlayer(guiName);
-        if(player == NULL)
+        if(player == nullptr)
         {
             orxout(internal_error, context::quests) << "GUIOverlay with name '" << guiName << "' has no player." << endl;
-            return NULL;
+            return nullptr;
         }
 

code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuest.cc

@@ -90 +90 @@
         {
             Quest* quest = QuestManager::getInstance().findQuest(this->getQuestId());
-            if(quest == NULL || !quest->start(player))
+            if(quest == nullptr || !quest->start(player))
                return false;
         }

code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuestHint.cc

@@ -113 +113 @@
         {
             QuestHint* hint = QuestManager::getInstance().findHint(this->hintId_);
-            if(hint == NULL || !hint->setActive(player))
+            if(hint == nullptr || !hint->setActive(player))
                 return false;
         }

code/branches/cpp11_v2/src/modules/questsystem/effects/AddReward.cc

@@ -90 +90 @@
             i--;
         }
-        return NULL;
+        return nullptr;
     }
 

code/branches/cpp11_v2/src/modules/questsystem/effects/CompleteQuest.cc

@@ -92 +92 @@
         {
             quest = QuestManager::getInstance().findQuest(this->getQuestId());
-            if(quest == NULL || !quest->complete(player))
+            if(quest == nullptr || !quest->complete(player))
                return false;
         }

code/branches/cpp11_v2/src/modules/questsystem/effects/FailQuest.cc

@@ -91 +91 @@
         {
             quest = QuestManager::getInstance().findQuest(this->getQuestId());
-            if(quest == NULL || !quest->fail(player))
+            if(quest == nullptr || !quest->fail(player))
                return false;
         }

code/branches/cpp11_v2/src/modules/tetris/Tetris.cc

@@ -72 +72 @@
         this->starttimer_.stopTimer();
 
-        this->player_ = NULL;
+        this->player_ = nullptr;
         this->setHUDTemplate("TetrisHUD");
         this->futureBrick_ = 0;
@@ -113 +113 @@
         SUPER(Tetris, tick, dt);
 
-        if((this->activeBrick_ != NULL)&&(!this->hasEnded()))
+        if((this->activeBrick_ != nullptr)&&(!this->hasEnded()))
         {
             if(!this->isValidBrickPosition(this->activeBrick_))
@@ -290 +290 @@
     void Tetris::start()
     {
-        if (this->center_ != NULL) // There needs to be a TetrisCenterpoint, i.e. the area the game takes place.
+        if (this->center_ != nullptr) // There needs to be a TetrisCenterpoint, i.e. the area the game takes place.
         {
             // Create the first brick.
@@ -323 +323 @@
     {
         this->activeBrick_->setVelocity(Vector3::ZERO);
-        if(this->activeBrick_ != NULL)
+        if(this->activeBrick_ != nullptr)
         {
             this->player_->stopControl();
@@ -351 +351 @@
         if(player && player->isHumanPlayer())
         {
-            if(this->activeBrick_ != NULL)
+            if(this->activeBrick_ != nullptr)
             {
                 this->player_->stopControl();
@@ -370 +370 @@
         assert(player);
 
-        if(this->player_ == NULL)
+        if(this->player_ == nullptr)
         {
             this->player_ = player;
@@ -381 +381 @@
     void Tetris::startBrick(void)
     {
-        if(this->player_ == NULL)
+        if(this->player_ == nullptr)
             return;
 
         unsigned int cameraIndex = 0;
-        if(this->activeBrick_ != NULL)
+        if(this->activeBrick_ != nullptr)
         {
             // Get camera settings
@@ -437 +437 @@
         Get the player.
     @return
-        Returns a pointer to the player. If there is no player, NULL is returned.
+        Returns a pointer to the player. If there is no player, nullptr is returned.
     */
     PlayerInfo* Tetris::getPlayer(void) const

code/branches/cpp11_v2/src/modules/tetris/TetrisBrick.cc

@@ -81 +81 @@
             this->attach(stone);
             this->formBrick(stone, i);
-            if(this->tetris_ != NULL)
+            if(this->tetris_ != nullptr)
             {
                 stone->setGame(this->tetris_);
-                if(this->tetris_->getCenterpoint() != NULL)
+                if(this->tetris_->getCenterpoint() != nullptr)
                     stone->addTemplate(this->tetris_->getCenterpoint()->getStoneTemplate());
                 else
-                    orxout()<< "tetris_->getCenterpoint == NULL in TetrisBrick.cc"<< endl;
+                    orxout()<< "tetris_->getCenterpoint == nullptr in TetrisBrick.cc"<< endl;
             }
             else
-                orxout()<< "tetris_ == NULL in TetrisBrick.cc"<< endl;
+                orxout()<< "tetris_ == nullptr in TetrisBrick.cc"<< endl;
         }
     }
@@ -161 +161 @@
         if(i < this->brickStones_.size())
             return this->brickStones_[i];
-        else return NULL;
+        else return nullptr;
     }
 
@@ -167 +167 @@
     Tetris* TetrisBrick::getTetris()
     {
-        if (this->getGametype() != NULL && this->getGametype()->isA(Class(Tetris)))
+        if (this->getGametype() != nullptr && this->getGametype()->isA(Class(Tetris)))
         {
             Tetris* tetrisGametype = orxonox_cast<Tetris*>(this->getGametype());
             return tetrisGametype;
         }
-        return NULL;
+        return nullptr;
     }
 

code/branches/cpp11_v2/src/modules/tetris/TetrisCenterpoint.cc

@@ -84 +84 @@
     void TetrisCenterpoint::checkGametype()
     {
-        if (this->getGametype() != NULL && this->getGametype()->isA(Class(Tetris)))
+        if (this->getGametype() != nullptr && this->getGametype()->isA(Class(Tetris)))
         {
             Tetris* tetrisGametype = orxonox_cast<Tetris*>(this->getGametype());

code/branches/cpp11_v2/src/modules/tetris/TetrisScore.cc

@@ -57 +57 @@
 
         this->owner_ = 0;
-        this->player_ = NULL;
+        this->player_ = nullptr;
     }
 
@@ -89 +89 @@
 
         // If the owner is set. The owner being a Tetris game.
-        if (this->owner_ != NULL)
+        if (this->owner_ != nullptr)
         {
             std::string score("0");
@@ -101 +101 @@
             {
                 // Save the name and score of each player as a string.
-                if (player_ != NULL)
+                if (player_ != nullptr)
                     score = multi_cast<std::string>(this->owner_->getScore(player_));
             }
@@ -111 +111 @@
     @brief
         Is called when the owner changes.
-        Sets the owner to NULL, if it is not a pointer to a Tetris game.
+        Sets the owner to nullptr, if it is not a pointer to a Tetris game.
     */
     void TetrisScore::changedOwner()
@@ -117 +117 @@
         SUPER(TetrisScore, changedOwner);
 
-        if (this->getOwner() != NULL && this->getOwner()->getGametype())
+        if (this->getOwner() != nullptr && this->getOwner()->getGametype())
             this->owner_ = orxonox_cast<Tetris*>(this->getOwner()->getGametype());
         else

code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.cc

@@ -90 +90 @@
         RegisterObject(TowerDefense);
 
-        selecter = NULL;
-        this->player_ = NULL;        
+        selecter = nullptr;
+        this->player_ = nullptr;
         this->setHUDTemplate("TowerDefenseHUD");
         this->waveNumber_ = 0;
@@ -117 +117 @@
     void TowerDefense::start()
     {        
-        if (center_ != NULL) // There needs to be a TowerDefenseCenterpoint, i.e. the area the game takes place.
-        {
-            if (selecter == NULL)
+        if (center_ != nullptr) // There needs to be a TowerDefenseCenterpoint, i.e. the area the game takes place.
+        {
+            if (selecter == nullptr)
             {
                 selecter = new TowerDefenseSelecter(this->center_->getContext());                
@@ -176 +176 @@
         WaypointController* controller = (WaypointController*)(en1->getXMLController());
 
-        if (controller != NULL && waypoints_.size() > 1)
+        if (controller != nullptr && waypoints_.size() > 1)
         {
             en1->setPosition(waypoints_.at(0)->getPosition() + offset_);
@@ -208 +208 @@
         player_ = player;
 
-        if (selecter->getPlayer() == NULL)
+        if (selecter->getPlayer() == nullptr)
         {
             player_->startControl(selecter);
@@ -219 +219 @@
         Get the player.
     @return
-        Returns a pointer to the player. If there is no player, NULL is returned.
+        Returns a pointer to the player. If there is no player, nullptr is returned.
     */
     PlayerInfo* TowerDefense::getPlayer(void) const
@@ -265 +265 @@
         SUPER(TowerDefense, tick, dt);
 
-        if (hasStarted() == false || player_ == NULL)
+        if (hasStarted() == false || player_ == nullptr)
         {
             return;
@@ -273 +273 @@
 
         //build/upgrade tower at selecter position
-        if (selecter != NULL && selecter->buildTower_ == true)
+        if (selecter != nullptr && selecter->buildTower_ == true)
         {
             selecter->buildTower_ = false;
@@ -289 +289 @@
         for (std::list<WeakPtr<TowerDefenseEnemy> >::iterator it = enemies_.begin(); it != enemies_.end(); )
         {
-            if (*it == NULL)
+            if (*it == nullptr)
             {
                 // the enemy was destroyed by a tower - remove it from the list
@@ -365 +365 @@
         TDCoordinate* thisCoord = &startCoord;
         TDCoordinate* nextCoord;
-        while ((nextCoord = getNextStreetCoord(thisCoord)) != NULL)
+        while ((nextCoord = getNextStreetCoord(thisCoord)) != nullptr)
         {
             waypoints_.push_back(fields_[nextCoord->GetX()][nextCoord->GetY()]);            
@@ -381 +381 @@
         if (thisField->getType() != STREET && thisField->getType() != START)
         {
-            return NULL;
+            return nullptr;
         }
 
@@ -406 +406 @@
         }
 
-        return NULL;
+        return nullptr;
     }
 }

code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseCenterpoint.cc

@@ -92 +92 @@
     void TowerDefenseCenterpoint::checkGametype()
     {
-        if (this->getGametype() != NULL && this->getGametype()->isA(Class(TowerDefense)))
+        if (this->getGametype() != nullptr && this->getGametype()->isA(Class(TowerDefense)))
         {
             // Sets the centerpoint of the gametype. The gametype uses this to later spawn in towers, he needs the tower template stored in the center point

code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.cc

@@ -47 +47 @@
     WeakPtr<TowerDefense> TowerDefenseEnemy::getGame()
     {
-        if (game == NULL)
+        if (game == nullptr)
         {
             for (ObjectList<TowerDefense>::iterator it = ObjectList<TowerDefense>::begin(); it != ObjectList<TowerDefense>::end(); ++it)

code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseField.cc

@@ -49 +49 @@
         RegisterObject(TowerDefenseField);
 
-        tower_ = NULL;
+        tower_ = nullptr;
         type_ = FREE;
-        center_ = NULL;
+        center_ = nullptr;
         upgrade_ = 0;
         setPosition(0,0,0);                            
@@ -119 +119 @@
     bool TowerDefenseField::canUpgrade()
     {
-        if (tower_ != NULL && upgrade_ < 5)
+        if (tower_ != nullptr && upgrade_ < 5)
         {
             return true;
@@ -129 +129 @@
     void TowerDefenseField::setAngle(int newAngle)
     {
-        if (modelGround_ != NULL)
+        if (modelGround_ != nullptr)
         {
             switch (newAngle)
@@ -152 +152 @@
         }
 
-        if (modelObject_ != NULL)
+        if (modelObject_ != nullptr)
         {
             switch (newAngle)
@@ -185 +185 @@
     {            
         modelGround_->setMeshSource("TD_F1.mesh");
-        tower_ = NULL;
+        tower_ = nullptr;
         type_ = FREE;
         setUpgrade(0);
@@ -194 +194 @@
     {      
         modelGround_->setMeshSource("TD_S5.mesh");
-        tower_ = NULL;
+        tower_ = nullptr;
         type_ = START;
         setUpgrade(0);
@@ -204 +204 @@
     {     
         modelGround_->setMeshSource("TD_S4.mesh");
-        tower_ = NULL;
+        tower_ = nullptr;
         type_ = END;
         setUpgrade(0);
@@ -213 +213 @@
     {      
         modelGround_->setMeshSource("TD_S1.mesh");
-        tower_ = NULL;
+        tower_ = nullptr;
         type_ = STREET;
         setUpgrade(0);
@@ -222 +222 @@
     {     
         modelGround_->setMeshSource("TD_S2.mesh");
-        tower_ = NULL;
+        tower_ = nullptr;
         type_ = STREET;
         setUpgrade(0);
@@ -231 +231 @@
     {    
         modelGround_->setMeshSource("TD_S3.mesh");
-        tower_ = NULL;
+        tower_ = nullptr;
         type_ = STREET;
         setUpgrade(0);
@@ -241 +241 @@
         modelGround_->setMeshSource("TD_F1.mesh");
         modelObject_->setMeshSource("TD_O1.mesh");
-        tower_ = NULL;
+        tower_ = nullptr;
         type_ = OBSTACLE;
         setUpgrade(0);
@@ -249 +249 @@
     void TowerDefenseField::createTower(int upgrade)
     {        
-        if (tower_ == NULL)
+        if (tower_ == nullptr)
         {
             modelGround_->setMeshSource("TD_F1.mesh");
@@ -256 +256 @@
             type_ = TOWER;
             setUpgrade(upgrade);
-            if (upgrade_ > 0 && modelObject_ != NULL)
+            if (upgrade_ > 0 && modelObject_ != nullptr)
             {
                 switch (upgrade_)
@@ -287 +287 @@
     void TowerDefenseField::destroyTower()
     {
-        if (tower_ != NULL)
+        if (tower_ != nullptr)
         {
             tower_->destroy();
-            tower_ = NULL;
+            tower_ = nullptr;
         }
     }

code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseTower.cc

@@ -25 +25 @@
     {
         RegisterObject(TowerDefenseTower);
-        game_ =NULL;
+        game_ =nullptr;
         this->setCollisionType(WorldEntity::None);
         upgrade = 1;

code/branches/cpp11_v2/src/modules/weapons/IceGunFreezer.cc

@@ -101 +101 @@
 
         // Check if the freezer is attached to a parent and check if the parent is a SpaceShip
-        if (parent != NULL && parent->isA(Class(SpaceShip)))
+        if (parent != nullptr && parent->isA(Class(SpaceShip)))
         {
             freezedSpaceShip_ = orxonox_cast<SpaceShip*>(parent);
@@ -118 +118 @@
     void IceGunFreezer::stopFreezing()
     {
-        if (freezedSpaceShip_ != NULL && freezeFactor_ != 0.0)
+        if (freezedSpaceShip_ != nullptr && freezeFactor_ != 0.0)
         {
             freezedSpaceShip_->addSpeedFactor(1/freezeFactor_);

code/branches/cpp11_v2/src/modules/weapons/projectiles/BasicProjectile.cc

@@ -88 +88 @@
                                     // The projectile is destroyed by its tick()-function (in the following tick).
 
-            Pawn* victim = orxonox_cast<Pawn*>(otherObject); // If otherObject isn't a Pawn, then victim is NULL
+            Pawn* victim = orxonox_cast<Pawn*>(otherObject); // If otherObject isn't a Pawn, then victim is nullptr
 
             WorldEntity* entity = orxonox_cast<WorldEntity*>(this);
@@ -146 +146 @@
     bool BasicProjectile::isObjectRelatedToShooter(WorldEntity* otherObject)
     {
-        for (WorldEntity* shooter = this->getShooter(); shooter != NULL; shooter = shooter->getParent())
+        for (WorldEntity* shooter = this->getShooter(); shooter != nullptr; shooter = shooter->getParent())
             if (otherObject == shooter)
                 return true;
-        for (WorldEntity* object = otherObject; object != NULL; object = object->getParent())
+        for (WorldEntity* object = otherObject; object != nullptr; object = object->getParent())
             if (otherObject == this->getShooter())
                 return true;

code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBombField.cc

@@ -137 +137 @@
                         float damage = FORCE_FIELD_EXPLOSION_DAMMAGE*(1-distanceVector.length()/EXPLOSION_RADIUS);
                         //orxout(debug_output) << "Damage: " << damage << endl;
-                        it->hit(shooter_, it->getWorldPosition(), NULL, damage, 0,0);
+                        it->hit(shooter_, it->getWorldPosition(), nullptr, damage, 0,0);
                         victimsAlreadyDamaged_.push_back(*it);
                     }

code/branches/cpp11_v2/src/modules/weapons/projectiles/Projectile.cc

@@ -94 +94 @@
     void Projectile::setCollisionShapeRadius(float radius)
     {
-        if (collisionShape_ != NULL && radius > 0)
+        if (collisionShape_ != nullptr && radius > 0)
         {
             collisionShape_->setRadius(radius);