- Timestamp:
- Jan 17, 2016, 1:59:00 PM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v3/src/modules/pickup/items/BoostPickup.cc
r11052 r11065 106 106 107 107 SpaceShip* ship = this->carrierToSpaceShipHelper(); 108 if(ship == NULL) // If the PickupCarrier is no SpaceShip, then this pickup is useless and therefore is destroyed.108 if(ship == nullptr) // If the PickupCarrier is no SpaceShip, then this pickup is useless and therefore is destroyed. 109 109 this->Pickupable::destroy(); 110 110 … … 128 128 Helper to transform the PickupCarrier to a SpaceShip, and throw an error message if the conversion fails. 129 129 @return 130 A pointer to the SpaceShip, or NULLif the conversion failed.130 A pointer to the SpaceShip, or nullptr if the conversion failed. 131 131 */ 132 132 SpaceShip* BoostPickup::carrierToSpaceShipHelper(void) … … 135 135 SpaceShip* ship = orxonox_cast<SpaceShip*>(carrier); 136 136 137 if(ship == NULL)137 if(ship == nullptr) 138 138 { 139 139 orxout(internal_error, context::pickups) << "Invalid PickupCarrier in BoostPickup." << endl;
Note: See TracChangeset
for help on using the changeset viewer.