Changeset 11071 for code/trunk/src/modules/invader/Invader.cc
- Timestamp:
- Jan 17, 2016, 10:29:21 PM (8 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/modules/invader/Invader.cc
r11052 r11071 61 61 RegisterObject(Invader); 62 62 this->numberOfBots_ = 0; //sets number of default bots temporarly to 0 63 this->center_ = 0;63 this->center_ = nullptr; 64 64 bEndGame = false; 65 65 lives = 3; … … 78 78 { 79 79 level++; 80 if (getPlayer() != NULL)80 if (getPlayer() != nullptr) 81 81 { 82 82 for (int i = 0; i < 7; i++) … … 103 103 InvaderShip* Invader::getPlayer() 104 104 { 105 if (player == NULL)105 if (player == nullptr) 106 106 { 107 for ( ObjectList<InvaderShip>::iterator it = ObjectList<InvaderShip>::begin(); it != ObjectList<InvaderShip>::end(); ++it)108 player = *it;107 for (InvaderShip* ship : ObjectList<InvaderShip>()) 108 player = ship; 109 109 } 110 110 return player; … … 113 113 void Invader::spawnEnemy() 114 114 { 115 if (getPlayer() == NULL)115 if (getPlayer() == nullptr) 116 116 return; 117 117 … … 134 134 newPawn->setPosition(player->getPosition() + Vector3(500.f + 100 * i, 0, float(rand())/RAND_MAX * 400 - 200)); 135 135 } 136 } 137 138 void Invader::setCenterpoint(InvaderCenterPoint* center) 139 { 140 this->center_ = center; 136 141 } 137 142 … … 160 165 this->bForceSpawn_ = true; 161 166 162 if (this->center_ == NULL) // abandon mission!167 if (this->center_ == nullptr) // abandon mission! 163 168 { 164 169 orxout(internal_error) << "Invader: No Centerpoint specified." << endl;
Note: See TracChangeset
for help on using the changeset viewer.