Changeset 6710 for code/trunk/src
- Timestamp:
- Apr 13, 2010, 9:50:11 AM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 4 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/ppspickups2 (added) merged: 6529-6532,6554-6555,6641-6642,6653,6684-6685,6689,6708
- Property svn:mergeinfo changed
-
code/trunk/src/modules/pickup/PickupPrereqs.h
r6709 r6710 76 76 //items 77 77 class HealthPickup; 78 class InvisiblePickup; 78 79 class MetaPickup; 79 80 class SpeedPickup; -
code/trunk/src/modules/pickup/items/CMakeLists.txt
r6709 r6710 1 1 ADD_SOURCE_FILES(PICKUP_SRC_FILES 2 3 2 HealthPickup.cc 4 3 InvisiblePickup.cc 4 MetaPickup.cc 5 5 SpeedPickup.cc 6 MetaPickup.cc7 8 6 ) -
code/trunk/src/orxonox/interfaces/PickupCarrier.h
r6709 r6710 47 47 namespace orxonox 48 48 { 49 class Pickupable; 49 50 //! Forward-declarations. 50 51 class Pickup; 51 52 class HealthPickup; 53 class InvisiblePickup; 52 54 class MetaPickup; 53 55 class SpeedPickup; … … 66 68 friend class Pickup; 67 69 friend class HealthPickup; 70 friend class InvisiblePickup; 68 71 friend class MetaPickup; 69 72 friend class SpeedPickup;
Note: See TracChangeset
for help on using the changeset viewer.