- Timestamp:
- Dec 17, 2008, 8:00:43 AM (15 years ago)
- Location:
- code/branches/presentation
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation
- Property svn:mergeinfo changed
/code/branches/pickups2 (added) merged: 2110,2136,2202,2227,2289-2290,2293-2294,2324,2342,2389,2397
- Property svn:mergeinfo changed
-
code/branches/presentation/src/orxonox/objects/worldentities/pawns/Pawn.h
r2493 r2500 31 31 32 32 #include "OrxonoxPrereqs.h" 33 33 #include "objects/pickup/ShipEquipment.h" 34 34 #include "objects/worldentities/ControllableEntity.h" 35 35 #include "objects/RadarViewable.h" … … 77 77 78 78 virtual void fire(WeaponMode::Enum fireMode); 79 80 79 virtual void postSpawn(); 81 80 … … 105 104 { return this->numexplosionchunks_; } 106 105 106 inline ShipEquipment& getPickUp() 107 {return this->pickUp;} 108 109 virtual void dropItems(); 110 107 111 protected: 108 112 virtual void death(); … … 110 114 virtual void spawneffect(); 111 115 116 ShipEquipment pickUp; 112 117 bool bAlive_; 118 113 119 114 120 float health_;
Note: See TracChangeset
for help on using the changeset viewer.