Changeset 11071 for code/trunk/src/modules/pickup/CollectiblePickup.h
- 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/pickup/CollectiblePickup.h
r9348 r11071 61 61 virtual ~CollectiblePickup(); //! Destructor. 62 62 63 virtual void changedUsed(void) ; //!< Is called when the pickup has transited from used to unused or the other way around.64 virtual void changedPickedUp(void) ; //!< Is called when the pickup has transited from picked up to dropped or the other way around.63 virtual void changedUsed(void) override; //!< Is called when the pickup has transited from used to unused or the other way around. 64 virtual void changedPickedUp(void) override; //!< Is called when the pickup has transited from picked up to dropped or the other way around. 65 65 66 66 /** … … 69 69 */ 70 70 bool isInCollection(void) const 71 { return this->collection_ != NULL; }71 { return this->collection_ != nullptr; } 72 72 73 73 private:
Note: See TracChangeset
for help on using the changeset viewer.