- Timestamp:
- Apr 15, 2009, 5:03:58 PM (15 years ago)
- Location:
- code/branches/pickups2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/pickups2
- Property svn:mergeinfo changed
/code/branches/pickups merged: 2828,2831,2864,2900 -
Property
svn:ignore
set to
build
dependencies
- Property svn:mergeinfo changed
-
code/branches/pickups2/src/orxonox/objects/worldentities/pawns/Pawn.h
r2826 r2917 31 31 32 32 #include "OrxonoxPrereqs.h" 33 #include "objects/pickup/ShipEquipment.h"34 33 #include "objects/worldentities/ControllableEntity.h" 35 34 #include "objects/RadarViewable.h" 36 35 #include "objects/weaponSystem/WeaponSystem.h" 36 #include "objects/pickup/PickupCollection.h" 37 37 38 38 namespace orxonox … … 107 107 { return this->numexplosionchunks_; } 108 108 109 inline ShipEquipment& getPickUp()110 {return this->pickUp;}111 112 109 virtual void dropItems(); 110 inline PickupCollection& getPickups() 111 { return this->pickups_; } 112 virtual void useItem() 113 { this->pickups_.useItem(); } 113 114 114 115 protected: … … 117 118 virtual void spawneffect(); 118 119 119 ShipEquipment pickUp;120 120 bool bAlive_; 121 121 122 PickupCollection pickups_; 122 123 123 124 float health_;
Note: See TracChangeset
for help on using the changeset viewer.