Changeset 11071 for code/trunk/src/orxonox/weaponsystem/Weapon.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/Weapon.h
r11052 r11071 50 50 virtual ~Weapon(); 51 51 52 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) ;52 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 53 53 54 54 void fire(unsigned int mode); … … 57 57 void addWeaponmode(WeaponMode* weaponmode); 58 58 WeaponMode* getWeaponmode(unsigned int index) const; 59 inline std::multimap<unsigned int, WeaponMode*>* getAllWeaponmodes()60 { return &weaponmodes_; }59 inline const std::multimap<unsigned int, WeaponMode*>& getAllWeaponmodes() const 60 { return weaponmodes_; } 61 61 inline int getNumWeaponModes() const 62 62 { return weaponmodes_.size(); }
Note: See TracChangeset
for help on using the changeset viewer.