Changeset 10768 for code/branches/cpp11_v2/src/modules/overlays/hud
- Timestamp:
- Nov 6, 2015, 10:54:34 PM (9 years ago)
- Location:
- code/branches/cpp11_v2/src/modules/overlays/hud
- Files:
-
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.cc
r9667 r10768 40 40 RegisterObject(AnnounceMessage); 41 41 42 this->owner_ = 0;42 this->owner_ = nullptr; 43 43 44 44 this->setDelay(3.0f); -
code/branches/cpp11_v2/src/modules/overlays/hud/CountDown.cc
r9943 r10768 71 71 RegisterObject(CountDown); 72 72 73 this->owner_ = 0;73 this->owner_ = nullptr; 74 74 this->hasStopped_ = false; 75 75 } -
code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.cc
r9667 r10768 40 40 RegisterObject(DeathMessage); 41 41 42 this->owner_ = 0;42 this->owner_ = nullptr; 43 43 44 44 this->setDelay(2.0f); -
code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.cc
r9667 r10768 40 40 RegisterObject(GametypeFadingMessage); 41 41 42 this->owner_ = 0;42 this->owner_ = nullptr; 43 43 this->setDelay(2.0f); 44 44 this->setFadeouttime(0.5f); -
code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.cc
r9667 r10768 42 42 { 43 43 RegisterObject(GametypeStaticMessage); 44 this->owner_ = 0;44 this->owner_ = nullptr; 45 45 } 46 46 -
code/branches/cpp11_v2/src/modules/overlays/hud/HUDBar.cc
r9667 r10768 191 191 return barColours_[index]; 192 192 else 193 return 0;193 return nullptr; 194 194 } 195 195 -
code/branches/cpp11_v2/src/modules/overlays/hud/HUDBoostBar.cc
r9667 r10768 42 42 RegisterObject(HUDBoostBar); 43 43 44 this->owner_ = 0;44 this->owner_ = nullptr; 45 45 this->flashInterval_ = 0.25f; 46 46 this->flashDt_ = 0.0f; -
code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc
r10765 r10768 41 41 42 42 this->setConfigValues(); 43 this->owner_ = 0;43 this->owner_ = nullptr; 44 44 } 45 45 -
code/branches/cpp11_v2/src/modules/overlays/hud/HUDHealthBar.cc
r9667 r10768 43 43 RegisterObject(HUDHealthBar); 44 44 45 this->owner_ = 0;45 this->owner_ = nullptr; 46 46 this->bUseBarColour_ = false; 47 47 … … 58 58 { 59 59 this->textoverlay_->destroy(); 60 this->textoverlay_ = 0;60 this->textoverlay_ = nullptr; 61 61 } 62 62 } -
code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc
r10765 r10768 69 69 RegisterClass ( HUDNavigation ); 70 70 71 HUDNavigation* HUDNavigation::localHUD_s = 0;71 HUDNavigation* HUDNavigation::localHUD_s = nullptr; 72 72 73 73 HUDNavigation::HUDNavigation(Context* context) : -
code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.cc
r9945 r10768 68 68 this->shapeMaterials_[RadarViewable::Triangle] = "RadarTriangle.png"; 69 69 this->shapeMaterials_[RadarViewable::Square] = "RadarSquare.png"; 70 this->owner_ = 0;70 this->owner_ = nullptr; 71 71 72 72 this->map3DFront_ = static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton() -
code/branches/cpp11_v2/src/modules/overlays/hud/HUDSpeedBar.cc
r9667 r10768 43 43 RegisterObject(HUDSpeedBar); 44 44 45 this->owner_ = 0;45 this->owner_ = nullptr; 46 46 } 47 47 -
code/branches/cpp11_v2/src/modules/overlays/hud/HUDTimer.cc
r9667 r10768 42 42 RegisterObject(HUDTimer); 43 43 44 this->owner_ = 0;44 this->owner_ = nullptr; 45 45 } 46 46 -
code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.cc
r9667 r10768 40 40 RegisterObject(KillMessage); 41 41 42 this->owner_ = 0;42 this->owner_ = nullptr; 43 43 44 44 this->setDelay(2.0f); -
code/branches/cpp11_v2/src/modules/overlays/hud/LastManStandingInfos.cc
r10624 r10768 43 43 RegisterObject(LastManStandingInfos); 44 44 45 this->lms_ = 0;46 this->player_ = 0;45 this->lms_ = nullptr; 46 this->player_ = nullptr; 47 47 this->bShowLives_ = false; 48 48 this->bShowPlayers_ = false; … … 91 91 else 92 92 { 93 this->player_ = 0;94 this->lms_ = 0;93 this->player_ = nullptr; 94 this->lms_ = nullptr; 95 95 } 96 96 } -
code/branches/cpp11_v2/src/modules/overlays/hud/LastTeamStandingInfos.cc
r10624 r10768 43 43 RegisterObject(LastTeamStandingInfos); 44 44 45 this->lts_ = 0;46 this->player_ = 0;45 this->lts_ = nullptr; 46 this->player_ = nullptr; 47 47 this->bShowLives_ = false; 48 48 this->bShowTeams_ = false; … … 91 91 else 92 92 { 93 this->player_ = 0;94 this->lts_ = 0;93 this->player_ = nullptr; 94 this->lts_ = nullptr; 95 95 } 96 96 } -
code/branches/cpp11_v2/src/modules/overlays/hud/PauseNotice.cc
r9667 r10768 40 40 RegisterObject(PauseNotice); 41 41 42 this->owner_ = 0;42 this->owner_ = nullptr; 43 43 } 44 44 -
code/branches/cpp11_v2/src/modules/overlays/hud/TeamBaseMatchScore.cc
r10624 r10768 43 43 RegisterObject(TeamBaseMatchScore); 44 44 45 this->owner_ = 0;45 this->owner_ = nullptr; 46 46 47 47 this->bShowBases_ = false; … … 120 120 this->owner_ = orxonox_cast<TeamBaseMatch*>(this->getOwner()->getGametype()); 121 121 else 122 this->owner_ = 0;122 this->owner_ = nullptr; 123 123 } 124 124 }
Note: See TracChangeset
for help on using the changeset viewer.