- Timestamp:
- Nov 18, 2011, 6:52:21 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/gamecontent/src/orxonox/worldentities/pawns/Pawn.h
r8891 r8942 35 35 #include "interfaces/PickupCarrier.h" 36 36 #include "interfaces/RadarViewable.h" 37 #include "interfaces/PartyMember.h" 37 38 #include "worldentities/ControllableEntity.h" 38 39 … … 40 41 { // tolua_export 41 42 class _OrxonoxExport Pawn // tolua_export 42 : public ControllableEntity, public RadarViewable, public PickupCarrier 43 : public ControllableEntity, public RadarViewable, public PickupCarrier//, public PartyMember 43 44 { // tolua_export 44 45 friend class WeaponSystem; … … 53 54 inline bool isAlive() const 54 55 { return this->bAlive_; } 56 57 inline void setTeam(int team) 58 { this->team_ = team; } 59 inline float getTeam() const 60 { return this->team_; } 55 61 56 62 virtual void setHealth(float health); … … 194 200 { return NULL; } 195 201 202 int team_; 203 196 204 float health_; 197 205 float maxHealth_;
Note: See TracChangeset
for help on using the changeset viewer.