Changeset 11071 for code/trunk/src/orxonox/weaponsystem/Munition.h
- Timestamp:
- Jan 17, 2016, 10:29:21 PM (8 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/weaponsystem/Munition.h
r11052 r11071 39 39 namespace orxonox 40 40 { 41 namespaceMunitionDeployment41 enum class MunitionDeployment 42 42 { 43 enum Value 44 { 45 Separate, // Every comsuming weapon mode has its own magazine. It is possible that one weapon mode is out of ammo while another still has some. 46 Share, // All comsuming weapon modes take their munition from the same magazine. If this magazine is empty a new one is loaded. 47 Stack // There is only one magazine where all the munition is stored. Use this deployment mode for heavy weapons loke rockets, bombs, ... 48 }; 49 } 43 Separate, // Every comsuming weapon mode has its own magazine. It is possible that one weapon mode is out of ammo while another still has some. 44 Share, // All comsuming weapon modes take their munition from the same magazine. If this magazine is empty a new one is loaded. 45 Stack // There is only one magazine where all the munition is stored. Use this deployment mode for heavy weapons loke rockets, bombs, ... 46 }; 50 47 51 48 class _OrxonoxExport Munition : public BaseObject … … 69 66 virtual ~Munition(); 70 67 71 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) ;68 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 72 69 73 70 unsigned int getNumMunition(WeaponMode* user) const; … … 80 77 inline unsigned int getMaxMunitionPerMagazine() const 81 78 { return this->maxMunitionPerMagazine_; } 82 inline MunitionDeployment ::ValuegetMunitionDeployment() const79 inline MunitionDeployment getMunitionDeployment() const 83 80 { return deployment_; } 84 81 … … 115 112 std::map<WeaponMode*, Magazine*> assignedMagazines_; // Maps weapon modes to magazines that are currently used. 116 113 117 MunitionDeployment ::Valuedeployment_; // Defines the behaviour how munition and magazines are distributed to the consuming weapon modes.114 MunitionDeployment deployment_; // Defines the behaviour how munition and magazines are distributed to the consuming weapon modes. 118 115 119 116 bool bAllowMunitionRefilling_;
Note: See TracChangeset
for help on using the changeset viewer.