Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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

replace '0' by 'nullptr'

Location:
code/branches/cpp11_v2/src/orxonox/infos
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/cpp11_v2/src/orxonox/infos/HumanPlayer.cc

    r10624 r10768  
    5353        this->defaultController_ = Class(NewHumanController);
    5454
    55         this->humanHud_ = 0;
    56         this->gametypeHud_ = 0;
     55        this->humanHud_ = nullptr;
     56        this->gametypeHud_ = nullptr;
    5757
    5858        this->setConfigValues();
     
    178178        {
    179179            this->humanHud_->destroy();
    180             this->humanHud_ = 0;
     180            this->humanHud_ = nullptr;
    181181        }
    182182
     
    194194        {
    195195            this->gametypeHud_->destroy();
    196             this->gametypeHud_ = 0;
     196            this->gametypeHud_ = nullptr;
    197197        }
    198198
  • code/branches/cpp11_v2/src/orxonox/infos/PlayerInfo.cc

    r10765 r10768  
    5151        this->bReadyToSpawn_ = false;
    5252        this->bSetUnreadyAfterSpawn_ = true;
    53         this->controller_ = 0;
    54         this->controllableEntity_ = 0;
     53        this->controller_ = nullptr;
     54        this->controllableEntity_ = nullptr;
    5555        this->controllableEntityID_ = OBJECTID_UNKNOWN;
    5656
    57         this->gtinfo_ = 0;
     57        this->gtinfo_ = nullptr;
    5858        this->gtinfoID_ = OBJECTID_UNKNOWN;
    5959        this->updateGametypeInfo(this->getGametype());
     
    7272            {
    7373                this->controller_->destroy();
    74                 this->controller_ = 0;
     74                this->controller_ = nullptr;
    7575            }
    7676
     
    126126    void PlayerInfo::updateGametypeInfo(Gametype* gametype)
    127127    {
    128         this->gtinfo_ = 0;
     128        this->gtinfo_ = nullptr;
    129129        this->gtinfoID_ = OBJECTID_UNKNOWN;
    130130
     
    141141        {
    142142            this->controller_->destroy();
    143             this->controller_ = 0;
     143            this->controller_ = nullptr;
    144144        }
    145145        this->controller_ = this->defaultController_.fabricate(this->getContext());
     
    214214            return;
    215215
    216         this->controllableEntity_->setController(0);
    217         this->controllableEntity_ = 0;
     216        this->controllableEntity_->setController(nullptr);
     217        this->controllableEntity_ = nullptr;
    218218        this->controllableEntityID_ = OBJECTID_UNKNOWN;
    219219
    220220        if (this->controller_)
    221             this->controller_->setControllableEntity(0);
     221            this->controller_->setControllableEntity(nullptr);
    222222
    223223        if ( GameMode::isMaster() )
     
    242242        tmp->setActive(false);
    243243        //this->controllableEntity_->getController()->setControllableEntity(nullptr);
    244         this->controllableEntity_->setController(0);
     244        this->controllableEntity_->setController(nullptr);
    245245    }
    246246
     
    253253            return;
    254254
    255         this->controllableEntity_->setController(0);
     255        this->controllableEntity_->setController(nullptr);
    256256        if(this->isHumanPlayer()) // TODO: Multiplayer?
    257257            this->controllableEntity_->destroyHud(); // HACK-ish
Note: See TracChangeset for help on using the changeset viewer.