Changeset 7163 for code/trunk/src/modules/pickup/Pickup.h
- Timestamp:
- Aug 11, 2010, 8:55:13 AM (14 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/modules/pickup/Pickup.h
- Property svn:eol-style set to native
r6728 r7163 40 40 #include "core/XMLPort.h" 41 41 42 #include " interfaces/Pickupable.h"42 #include "CollectiblePickup.h" 43 43 44 44 #include "tools/Timer.h" … … 74 74 Damian 'Mozork' Frick 75 75 */ 76 class _PickupExport Pickup : public Pickupable, public BaseObject76 class _PickupExport Pickup : public CollectiblePickup, public BaseObject 77 77 { 78 78 79 p rotected:79 public: 80 80 Pickup(BaseObject* creator); //!< Constructor. 81 82 public:83 81 virtual ~Pickup(); //!< Destructor. 84 82 … … 167 165 private: 168 166 void initialize(void); //!< Initializes the member variables. 169 167 170 168 //TODO: Problems, when there are more Timers needed? Solutions? 171 169 Timer durationTimer_; //!< Timer at the disposal of each Class implementing Pickup.
Note: See TracChangeset
for help on using the changeset viewer.