- Timestamp:
- Nov 4, 2015, 10:25:42 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/modules/pickup/items/MetaPickup.cc
r9667 r10765 107 107 { 108 108 PickupCarrier* carrier = this->getCarrier(); 109 if(this->getMetaType() != pickupMetaType::none && carrier != NULL)109 if(this->getMetaType() != pickupMetaType::none && carrier != nullptr) 110 110 { 111 111 // If the metaType is destroyCarrier, then the PickupCarrier is destroyed. … … 121 121 { 122 122 Pickupable* pickup = (*it); 123 if(pickup == NULL|| pickup == this)123 if(pickup == nullptr || pickup == this) 124 124 continue; 125 125
Note: See TracChangeset
for help on using the changeset viewer.