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

Timestamp:

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

Author:

landauf

Message:

replace 'NULL' by 'nullptr'

Location:

code/branches/cpp11_v2/src/modules/towerdefense

Files:

• TowerDefense.cc (modified) (11 diffs)
• TowerDefenseCenterpoint.cc (modified) (1 diff)
• TowerDefenseEnemy.cc (modified) (1 diff)
• TowerDefenseField.cc (modified) (14 diffs)
• TowerDefenseTower.cc (modified) (1 diff)

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;