Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 6, 2015, 10:54:34 PM (9 years ago)
Author:
landauf
Message:

replace '0' by 'nullptr'

Location:
code/branches/cpp11_v2/src/modules
Files:
51 edited

Legend:

Unmodified
Added
Removed

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

    r10765 r10768  
    5959        comboTimer.setTimer(3.0f, true, createExecutor(createFunctor(&DodgeRace::comboControll, this)));
    6060        this->numberOfBots_ = 0; //sets number of default bots temporarly to 0
    61         this->center_ = 0;
     61        this->center_ = nullptr;
    6262
    6363        this->setHUDTemplate("DodgeRaceHUD");

  • code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceHUDinfo.cc

    r10624 r10768  
    4040        RegisterObject(DodgeRaceHUDinfo);
    4141
    42         this->DodgeRaceGame = 0;
     42        this->DodgeRaceGame = nullptr;
    4343        this->bShowPoints_ = true;
    4444    }
    … …  
    8686        else
    8787        {
    88             this->DodgeRaceGame = 0;
     88            this->DodgeRaceGame = nullptr;
    8989        }
    9090    }

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

    r10765 r10768  
    416416        for (std::vector<StaticEntity*>::const_iterator it = allObjects.begin(); it != allObjects.end(); ++it)
    417417        {
    418             for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape) != 0; everyShape++)
     418            for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape) != nullptr; everyShape++)
    419419            {
    420420                btCollisionShape* currentShape = (*it)->getAttachedCollisionShape(everyShape)->getCollisionShape();
    … …  
    444444        for (std::vector<StaticEntity*>::iterator it = allObjects.begin(); it != allObjects.end(); ++it)
    445445        {
    446             for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape) != 0; everyShape++)
     446            for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape) != nullptr; everyShape++)
    447447            {
    448448                btCollisionShape* currentShape = (*it)->getAttachedCollisionShape(everyShape)->getCollisionShape();
    … …  
    540540        //                    {   orxout()<<"Problempoint 1.1"<<endl; continue;}
    541541        //                    //TODO: Probably it points on a wrong object
    542         //                    for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape)!=0; everyShape++)
     542        //                    for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape)!=nullptr; everyShape++)
    543543        //                    {
    544544        //                        if((*it)->getAttachedCollisionShape(everyShape)->getCollisionShape()==nullptr)
    … …  
    572572        //                        if((*it)==nullptr)
    573573        //                        {   orxout()<<"Problempoint 1"<<endl; continue;}
    574         //                        for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape)!=0; everyShape++)
     574        //                        for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape)!=nullptr; everyShape++)
    575575        //                        {
    576576        //                            if((*it)->getAttachedCollisionShape(everyShape)->getCollisionShape()==nullptr)

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

    r10765 r10768  
    100100        return this->checkpoints_[index];
    101101        else
    102         return 0;
     102        return nullptr;
    103103    }
    104104
    … …  
    116116        if (this->checkpoints_[i]->getCheckpointIndex() == index)
    117117        return this->checkpoints_[i];
    118         return 0;
     118        return nullptr;
    119119    }
    120120

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

    r10765 r10768  
    6161        RegisterObject(Invader);
    6262        this->numberOfBots_ = 0; //sets number of default bots temporarly to 0
    63         this->center_ = 0;
     63        this->center_ = nullptr;
    6464        bEndGame = false;
    6565        lives = 3;

  • code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.cc

    r10733 r10768  
    4040        RegisterObject(InvaderHUDinfo);
    4141
    42         this->InvaderGame = 0;
     42        this->InvaderGame = nullptr;
    4343        this->bShowLives_ = false;
    4444        this->bShowLevel_ = false;
    … …  
    132132        else
    133133        {
    134             this->InvaderGame = 0;
     134            this->InvaderGame = nullptr;
    135135        }
    136136    }

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

    r10765 r10768  
    6565        RegisterObject(Jump);
    6666
    67         center_ = 0;
    68         figure_ = 0;
    69         camera = 0;
     67        center_ = nullptr;
     68        figure_ = nullptr;
     69        camera = nullptr;
    7070        setHUDTemplate("JumpHUD");
    7171    }
    … …  
    270270    void Jump::cleanup()
    271271    {
    272         camera = 0;
     272        camera = nullptr;
    273273    }
    274274
    … …  
    340340        else
    341341        {
    342             return 0;
     342            return nullptr;
    343343        }
    344344    }

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

    r10765 r10768  
    5151
    5252        dead_ = false;
    53         figure_ = 0;
     53        figure_ = nullptr;
    5454        width_ = 0.0;
    5555        height_ = 0.0;

  • code/branches/cpp11_v2/src/modules/jump/JumpItem.cc

    r10733 r10768  
    4848        attachedToFigure_ = false;
    4949
    50         figure_ = 0;
     50        figure_ = nullptr;
    5151        height_ = 0.0;
    5252        width_ = 0.0;

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

    r10765 r10768  
    4848        RegisterObject(JumpPlatform);
    4949
    50         figure_ = 0;
     50        figure_ = nullptr;
    5151
    5252        setPosition(Vector3(0,0,0));

  • code/branches/cpp11_v2/src/modules/jump/JumpProjectile.cc

    r10733 r10768  
    4747        RegisterObject(JumpProjectile);
    4848
    49         figure_ = 0;
     49        figure_ = nullptr;
    5050        setPosition(Vector3(0,0,0));
    5151        setVelocity(Vector3(0,0,250.0));

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

    r10765 r10768  
    100100    void JumpSpring::accelerateFigure()
    101101    {
    102         if (figure_ != 0)
     102        if (figure_ != nullptr)
    103103        {
    104104            figure_->JumpFromSpring(this);

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

    r10765 r10768  
    6666        RegisterObject(Mini4Dgame);
    6767
    68         this->board_ = 0;
     68        this->board_ = nullptr;
    6969
    7070        // Set the type of Bots for this particular Gametype.
    … …  
    9191        {
    9292            //this->board_->destroy();
    93             this->board_ = 0;
     93            this->board_ = nullptr;
    9494        }
    9595    }

  • code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameAI.cc

    r10230 r10768  
    6060
    6161        this->setConfigValues();
    62         this->center_ = 0;
     62        this->center_ = nullptr;
    6363    }
    6464

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

    r10765 r10768  
    6464                    for(int l=0;l<4;l++){
    6565                        this->board[i][j][k][l]=mini4DgamePlayerColor::none;
    66                         this->blinkingBillboards[i][j][k][l] = 0;
     66                        this->blinkingBillboards[i][j][k][l] = nullptr;
    6767                    }
    6868                }
    … …  
    9797        this->board[move.x][move.y][move.z][move.w] = mini4DgamePlayerColor::none;
    9898        this->blinkingBillboards[move.x][move.y][move.z][move.w]->destroy();
    99         this->blinkingBillboards[move.x][move.y][move.z][move.w] = 0;
     99        this->blinkingBillboards[move.x][move.y][move.z][move.w] = nullptr;
    100100        if(player_toggle_){
    101101            this->player_toggle_ = false;

  • code/branches/cpp11_v2/src/modules/objects/Attacher.cc

    r9667 r10768  
    4040        RegisterObject(Attacher);
    4141
    42         this->target_ = 0;
     42        this->target_ = nullptr;
    4343    }
    4444
    … …  
    9090            ++i;
    9191        }
    92         return 0;
     92        return nullptr;
    9393    }
    9494
    … …  
    9696    {
    9797        this->targetname_ = target;
    98         this->target_ = 0;
     98        this->target_ = nullptr;
    9999
    100100        if (this->targetname_.empty())

  • code/branches/cpp11_v2/src/modules/objects/controllers/TurretController.cc

    r10622 r10768  
    8181        {
    8282            this->forgetTarget();
    83             turret->setTarget(0);
     83            turret->setTarget(nullptr);
    8484        }
    8585
    … …  
    9999        float minScore = FLT_MAX;
    100100        float tempScore;
    101         Pawn* minScorePawn = 0;
     101        Pawn* minScorePawn = nullptr;
    102102
    103103        for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++it)

  • code/branches/cpp11_v2/src/modules/objects/eventsystem/EventDispatcher.cc

    r9667 r10768  
    7979            ++i;
    8080        }
    81         return 0;
     81        return nullptr;
    8282    }
    8383}

  • code/branches/cpp11_v2/src/modules/objects/eventsystem/EventFilter.cc

    r9667 r10768  
    102102            ++i;
    103103        }
    104         return 0;
     104        return nullptr;
    105105    }
    106106
    … …  
    119119            ++i;
    120120        }
    121         return 0;
     121        return nullptr;
    122122    }
    123123}

  • code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.cc

    r9667 r10768  
    4040        RegisterObject(AnnounceMessage);
    4141
    42         this->owner_ = 0;
     42        this->owner_ = nullptr;
    4343
    4444        this->setDelay(3.0f);

  • code/branches/cpp11_v2/src/modules/overlays/hud/CountDown.cc

    r9943 r10768  
    7171        RegisterObject(CountDown);
    7272
    73         this->owner_ = 0;
     73        this->owner_ = nullptr;
    7474        this->hasStopped_ = false;
    7575    }

  • code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.cc

    r9667 r10768  
    4040        RegisterObject(DeathMessage);
    4141
    42         this->owner_ = 0;
     42        this->owner_ = nullptr;
    4343
    4444        this->setDelay(2.0f);

  • code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.cc

    r9667 r10768  
    4040        RegisterObject(GametypeFadingMessage);
    4141
    42         this->owner_ = 0;
     42        this->owner_ = nullptr;
    4343        this->setDelay(2.0f);
    4444        this->setFadeouttime(0.5f);

  • code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.cc

    r9667 r10768  
    4242    {
    4343        RegisterObject(GametypeStaticMessage);
    44         this->owner_ = 0;
     44        this->owner_ = nullptr;
    4545    }
    4646

  • code/branches/cpp11_v2/src/modules/overlays/hud/HUDBar.cc

    r9667 r10768  
    191191            return barColours_[index];
    192192        else
    193             return 0;
     193            return nullptr;
    194194    }
    195195

  • code/branches/cpp11_v2/src/modules/overlays/hud/HUDBoostBar.cc

    r9667 r10768  
    4242        RegisterObject(HUDBoostBar);
    4343
    44         this->owner_ = 0;
     44        this->owner_ = nullptr;
    4545        this->flashInterval_ = 0.25f;
    4646        this->flashDt_ = 0.0f;

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

    r10765 r10768  
    4141
    4242        this->setConfigValues();
    43         this->owner_ = 0;
     43        this->owner_ = nullptr;
    4444    }
    4545

  • code/branches/cpp11_v2/src/modules/overlays/hud/HUDHealthBar.cc

    r9667 r10768  
    4343        RegisterObject(HUDHealthBar);
    4444
    45         this->owner_ = 0;
     45        this->owner_ = nullptr;
    4646        this->bUseBarColour_ = false;
    4747
    … …  
    5858        {
    5959            this->textoverlay_->destroy();
    60             this->textoverlay_ = 0;
     60            this->textoverlay_ = nullptr;
    6161        }
    6262    }

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

    r10765 r10768  
    6969    RegisterClass ( HUDNavigation );
    7070
    71     HUDNavigation* HUDNavigation::localHUD_s = 0;
     71    HUDNavigation* HUDNavigation::localHUD_s = nullptr;
    7272
    7373    HUDNavigation::HUDNavigation(Context* context) :

  • code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.cc

    r9945 r10768  
    6868        this->shapeMaterials_[RadarViewable::Triangle] = "RadarTriangle.png";
    6969        this->shapeMaterials_[RadarViewable::Square]   = "RadarSquare.png";
    70         this->owner_ = 0;
     70        this->owner_ = nullptr;
    7171
    7272        this->map3DFront_ = static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton()

  • code/branches/cpp11_v2/src/modules/overlays/hud/HUDSpeedBar.cc

    r9667 r10768  
    4343        RegisterObject(HUDSpeedBar);
    4444
    45         this->owner_ = 0;
     45        this->owner_ = nullptr;
    4646    }
    4747

  • code/branches/cpp11_v2/src/modules/overlays/hud/HUDTimer.cc

    r9667 r10768  
    4242        RegisterObject(HUDTimer);
    4343
    44         this->owner_ = 0;
     44        this->owner_ = nullptr;
    4545    }
    4646

  • code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.cc

    r9667 r10768  
    4040        RegisterObject(KillMessage);
    4141
    42         this->owner_ = 0;
     42        this->owner_ = nullptr;
    4343
    4444        this->setDelay(2.0f);

  • code/branches/cpp11_v2/src/modules/overlays/hud/LastManStandingInfos.cc

    r10624 r10768  
    4343        RegisterObject(LastManStandingInfos);
    4444
    45         this->lms_ = 0;
    46         this->player_ = 0;
     45        this->lms_ = nullptr;
     46        this->player_ = nullptr;
    4747        this->bShowLives_ = false;
    4848        this->bShowPlayers_ = false;
    … …  
    9191        else
    9292        {
    93             this->player_ = 0;
    94             this->lms_ = 0;
     93            this->player_ = nullptr;
     94            this->lms_ = nullptr;
    9595        }
    9696    }

  • code/branches/cpp11_v2/src/modules/overlays/hud/LastTeamStandingInfos.cc

    r10624 r10768  
    4343        RegisterObject(LastTeamStandingInfos);
    4444
    45         this->lts_ = 0;
    46         this->player_ = 0;
     45        this->lts_ = nullptr;
     46        this->player_ = nullptr;
    4747        this->bShowLives_ = false;
    4848        this->bShowTeams_ = false;
    … …  
    9191        else
    9292        {
    93             this->player_ = 0;
    94             this->lts_ = 0;
     93            this->player_ = nullptr;
     94            this->lts_ = nullptr;
    9595        }
    9696    }

  • code/branches/cpp11_v2/src/modules/overlays/hud/PauseNotice.cc

    r9667 r10768  
    4040        RegisterObject(PauseNotice);
    4141
    42         this->owner_ = 0;
     42        this->owner_ = nullptr;
    4343    }
    4444

  • code/branches/cpp11_v2/src/modules/overlays/hud/TeamBaseMatchScore.cc

    r10624 r10768  
    4343        RegisterObject(TeamBaseMatchScore);
    4444
    45         this->owner_ = 0;
     45        this->owner_ = nullptr;
    4646
    4747        this->bShowBases_ = false;
    … …  
    120120            this->owner_ = orxonox_cast<TeamBaseMatch*>(this->getOwner()->getGametype());
    121121        else
    122             this->owner_ = 0;
     122            this->owner_ = nullptr;
    123123    }
    124124}

  • code/branches/cpp11_v2/src/modules/overlays/stats/CreateLines.cc

    r6502 r10768  
    3737    CreateLines::CreateLines(float leftOffset, float topOffset, float width, float height)
    3838    {
    39         playerNameText_ = new OverlayText(0);
     39        playerNameText_ = new OverlayText(nullptr);
    4040        playerNameText_->setTextSize(0.04f);
    4141        playerNameText_->setColour(ColourValue(0.0f, 0.75f, 0.2f, 1.0f));
    4242        playerNameText_->setPosition(Vector2(0.1f, topOffset + 0.01f));
    4343
    44         scoreText_ = new OverlayText(0);
     44        scoreText_ = new OverlayText(nullptr);
    4545        scoreText_->setTextSize(0.04f);
    4646        scoreText_->setColour(ColourValue(0.0f, 0.75f, 0.2f, 1.0f));
    4747        scoreText_->setPosition(Vector2(0.6f, topOffset + 0.01f));
    4848
    49         deathsText_ = new OverlayText(0);
     49        deathsText_ = new OverlayText(nullptr);
    5050        deathsText_->setTextSize(0.04f);
    5151        deathsText_->setColour(ColourValue(0, 0.75f, 0.2f, 1.0f));
    5252        deathsText_->setPosition(Vector2(0.8f, topOffset + 0.01f));
    5353
    54         background_ = new Stats(0);
     54        background_ = new Stats(nullptr);
    5555        background_->setPosition(Vector2(leftOffset, topOffset));
    5656        background_->setSize(Vector2(width, height));

  • code/branches/cpp11_v2/src/modules/overlays/stats/Stats.cc

    r9667 r10768  
    4646    Stats::Stats(Context* context)
    4747        : OrxonoxOverlay(context)
    48         , statsOverlayNoise_(0)
    49         , statsOverlayBorder_(0)
     48        , statsOverlayNoise_(nullptr)
     49        , statsOverlayBorder_(nullptr)
    5050    {
    5151        RegisterObject(Stats);

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

    r10765 r10768  
    6464        RegisterObject(Pong);
    6565
    66         this->center_ = 0;
    67         this->ball_ = 0;
    68         this->bat_[0] = 0;
    69         this->bat_[1] = 0;
     66        this->center_ = nullptr;
     67        this->ball_ = nullptr;
     68        this->bat_[0] = nullptr;
     69        this->bat_[1] = nullptr;
    7070
    7171        this->setHUDTemplate("PongHUD");
    … …  
    106106        {
    107107            this->ball_->destroy();
    108             this->ball_ = 0;
     108            this->ball_ = nullptr;
    109109        }
    110110
    … …  
    115115            {
    116116                this->bat_[0]->destroy();
    117                 this->bat_[0] = 0;
     117                this->bat_[0] = nullptr;
    118118            }
    119119        }
    … …  
    329329            return this->bat_[0]->getPlayer();
    330330        else
    331             return 0;
     331            return nullptr;
    332332    }
    333333
    … …  
    343343            return this->bat_[1]->getPlayer();
    344344        else
    345             return 0;
     345            return nullptr;
    346346    }
    347347}

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

    r10765 r10768  
    5757        RegisterObject(PongAI);
    5858
    59         this->ball_ = 0;
     59        this->ball_ = nullptr;
    6060        this->ballDirection_ = Vector2::ZERO;
    6161        this->ballEndPosition_ = 0;

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

    r10765 r10768  
    6161        this->speed_ = 0;
    6262        this->accelerationFactor_ = 1.0f;
    63         this->bat_ = 0;
     63        this->bat_ = nullptr;
    6464        this->bDeleteBats_ = false;
    6565        this->batID_ = new unsigned int[2];
    … …  
    8282             else
    8383             {
    84                  this->defScoreSound_ = 0;
    85                  this->defBatSound_ = 0;
    86                  this->defBoundarySound_ = 0;
     84                 this->defScoreSound_ = nullptr;
     85                 this->defBatSound_ = nullptr;
     86                 this->defBoundarySound_ = nullptr;
    8787             }
    8888    }

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

    r10765 r10768  
    5555        RegisterObject(PongScore);
    5656
    57         this->owner_ = 0;
     57        this->owner_ = nullptr;
    5858
    5959        this->bShowName_ = false;
    … …  
    172172            this->owner_ = orxonox_cast<Pong*>(this->getOwner()->getGametype());
    173173        else
    174             this->owner_ = 0;
     174            this->owner_ = nullptr;
    175175    }
    176176}

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

    r10765 r10768  
    106106
    107107        MultiTriggerContainer * cont = orxonox_cast<MultiTriggerContainer *>(trigger);
    108         if(cont == 0)
     108        if(cont == nullptr)
    109109            return true;
    110110
    111111        DistanceMultiTrigger * originatingTrigger = orxonox_cast<DistanceMultiTrigger *>(cont->getOriginator());
    112         if(originatingTrigger == 0)
     112        if(originatingTrigger == nullptr)
    113113        {
    114114            return true;
    … …  
    116116
    117117        MobileEntity * entity = orxonox_cast<MobileEntity *>(cont->getData());
    118         if(entity == 0)
     118        if(entity == nullptr)
    119119            return true;
    120120

  • code/branches/cpp11_v2/src/modules/portals/PortalLink.cc

    r9667 r10768  
    4040    std::map<PortalEndPoint *, PortalEndPoint *> PortalLink::links_s;
    4141
    42     PortalLink::PortalLink(Context* context) : BaseObject(context), fromID_(0), toID_(0), from_(0), to_(0)
     42    PortalLink::PortalLink(Context* context) : BaseObject(context), fromID_(0), toID_(0), from_(nullptr), to_(nullptr)
    4343    {
    4444        RegisterObject(PortalLink);
    … …  
    6767    void PortalLink::use(MobileEntity* entity, PortalEndPoint * entrance)
    6868    {
    69         if(entrance == 0)
     69        if(entrance == nullptr)
    7070            return;
    7171

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

    r10765 r10768  
    6666        RegisterObject(Tetris);
    6767
    68         this->activeBrick_ = 0;
     68        this->activeBrick_ = nullptr;
    6969
    7070        // Pre-set the timer, but don't start it yet.
    … …  
    7474        this->player_ = nullptr;
    7575        this->setHUDTemplate("TetrisHUD");
    76         this->futureBrick_ = 0;
     76        this->futureBrick_ = nullptr;
    7777    }
    7878
    … …  
    9696        {
    9797            this->activeBrick_->destroy();
    98             this->activeBrick_ = 0;
     98            this->activeBrick_ = nullptr;
    9999        }
    100100        if (this->futureBrick_)
    101101        {
    102102            this->futureBrick_->destroy();
    103             this->futureBrick_ = 0;
     103            this->futureBrick_ = nullptr;
    104104        }
    105105
    … …  
    396396        // Make the last brick to be created the active brick.
    397397        this->activeBrick_ = this->futureBrick_;
    398         this->futureBrick_ = 0;
     398        this->futureBrick_ = nullptr;
    399399
    400400        // set its position

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

    r10765 r10768  
    5656        RegisterObject(TetrisScore);
    5757
    58         this->owner_ = 0;
     58        this->owner_ = nullptr;
    5959        this->player_ = nullptr;
    6060    }
    … …  
    120120            this->owner_ = orxonox_cast<Tetris*>(this->getOwner()->getGametype());
    121121        else
    122             this->owner_ = 0;
     122            this->owner_ = nullptr;
    123123    }
    124124}

  • code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseHUDController.cc

    r10629 r10768  
    3939    {
    4040        RegisterObject(TowerDefenseHUDController);
    41         this->td = 0;
     41        this->td = nullptr;
    4242    }
    4343
    … …  
    8989                    else
    9090                    {
    91                         this->td = 0;
     91                        this->td = nullptr;
    9292                    }
    9393                }

  • code/branches/cpp11_v2/src/modules/weapons/projectiles/ParticleProjectile.cc

    r10624 r10768  
    5858        }
    5959        else
    60             this->particles_ = 0;
     60            this->particles_ = nullptr;
    6161    }
    6262

  • code/branches/cpp11_v2/src/modules/weapons/projectiles/Rocket.cc

    r10622 r10768  
    117117        else
    118118        {
    119             this->defSndWpnEngine_ = 0;
    120             this->defSndWpnLaunch_ = 0;
     119            this->defSndWpnEngine_ = nullptr;
     120            this->defSndWpnLaunch_ = nullptr;
    121121        }
    122122

  • code/branches/cpp11_v2/src/modules/weapons/projectiles/RocketOld.cc

    r10622 r10768  
    117117        else
    118118        {
    119             this->defSndWpnEngine_ = 0;
    120             this->defSndWpnLaunch_ = 0;
     119            this->defSndWpnEngine_ = nullptr;
     120            this->defSndWpnLaunch_ = nullptr;
    121121        }
    122122
Note: See TracChangeset for help on using the changeset viewer.