- Timestamp:
- Nov 6, 2015, 10:54:34 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.cc
r10650 r10768 76 76 this->reloadWaitCountdown_ = 0; 77 77 78 this->lastHitOriginator_ = 0;78 this->lastHitOriginator_ = nullptr; 79 79 80 80 // set damage multiplier to default value 1, meaning nominal damage … … 91 91 } 92 92 else 93 this->weaponSystem_ = 0;93 this->weaponSystem_ = nullptr; 94 94 95 95 this->setRadarObjectColour(ColourValue::Red); … … 109 109 else 110 110 { 111 this->explosionSound_ = 0;111 this->explosionSound_ = nullptr; 112 112 } 113 113 } … … 345 345 { 346 346 // delete the AIController // <-- TODO: delete? nothing is deleted here... should we delete the controller? 347 slave->setControllableEntity( 0);347 slave->setControllableEntity(nullptr); 348 348 349 349 // set a new master within the formation … … 509 509 return this->weaponSystem_->getWeaponSlot(index); 510 510 else 511 return 0;511 return nullptr; 512 512 } 513 513 … … 523 523 return this->weaponSystem_->getWeaponSet(index); 524 524 else 525 return 0;525 return nullptr; 526 526 } 527 527 … … 551 551 return this->weaponSystem_->getWeaponPack(index); 552 552 else 553 return 0;553 return nullptr; 554 554 } 555 555 … … 594 594 return it->getController(); 595 595 } 596 return 0;596 return nullptr; 597 597 } 598 598
Note: See TracChangeset
for help on using the changeset viewer.
