Changeset 5935 for code/branches/pickup/src/orxonox/pickup/ModifierPickup.h
- Timestamp:
- Oct 13, 2009, 5:05:17 PM (15 years ago)
- Location:
- code/branches/pickup
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/pickup
- Property svn:mergeinfo changed
-
code/branches/pickup/src/orxonox/pickup/ModifierPickup.h
r5902 r5935 152 152 153 153 float duration_; //!< Duration of this pickup's effect (0 for unlimited). 154 Timer <ModifierPickup>timer_; //!< Timer used if the pickup's effect has a time limit.154 Timer timer_; //!< Timer used if the pickup's effect has a time limit. 155 155 }; 156 156 }
Note: See TracChangeset
for help on using the changeset viewer.