- Timestamp:
- May 25, 2009, 4:19:14 AM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/weapons (added) merged: 2898,2901,2912,2914-2915,2918-2924,2969,2979,2981,2983,2987,3012
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.h
r3038 r3053 34 34 #include "objects/worldentities/ControllableEntity.h" 35 35 #include "objects/RadarViewable.h" 36 #include "objects/weaponSystem/WeaponSystem.h"37 36 38 37 namespace orxonox … … 40 39 class _OrxonoxExport Pawn : public ControllableEntity, public RadarViewable 41 40 { 41 friend class WeaponSystem; 42 42 43 public: 43 44 Pawn(BaseObject* creator); … … 76 77 virtual void kill(); 77 78 78 virtual void fire(WeaponMode::Enum fireMode); 79 virtual void fire(unsigned int firemode); 80 virtual void reload(); 79 81 virtual void postSpawn(); 80 82 81 void setWeaponSlot(WeaponSlot * wSlot);83 void addWeaponSlot(WeaponSlot * wSlot); 82 84 WeaponSlot * getWeaponSlot(unsigned int index) const; 83 void setWeaponPack(WeaponPack * wPack); 84 WeaponPack * getWeaponPack(unsigned int firemode) const; 85 void setWeaponSet(WeaponSet * wSet); 85 void addWeaponSet(WeaponSet * wSet); 86 86 WeaponSet * getWeaponSet(unsigned int index) const; 87 void addWeaponPack(WeaponPack * wPack); 88 WeaponPack * getWeaponPack(unsigned int index) const; 87 89 88 90 inline const WorldEntity* getWorldEntity() const … … 130 132 unsigned int fire_; 131 133 unsigned int firehack_; 134 bool bReload_; 132 135 133 136 std::string spawnparticlesource_; 134 137 float spawnparticleduration_; 135 138 unsigned int numexplosionchunks_; 139 140 private: 141 inline void setWeaponSystem(WeaponSystem* weaponsystem) 142 { this->weaponSystem_ = weaponsystem; } 136 143 }; 137 144
Note: See TracChangeset
for help on using the changeset viewer.