Changeset 10817 for code/branches/cpp11_v2/src/orxonox/weaponsystem
- Timestamp:
- Nov 19, 2015, 11:40:28 AM (9 years ago)
- Location:
- code/branches/cpp11_v2/src/orxonox/weaponsystem
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/orxonox/weaponsystem/DefaultWeaponmodeLink.h
r9667 r10817 42 42 virtual ~DefaultWeaponmodeLink(); 43 43 44 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) ;44 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 45 45 46 46 inline void setFiremode(const unsigned int firemode) -
code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.h
r10650 r10817 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); -
code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponMode.h
r10650 r10817 51 51 virtual ~WeaponMode(); 52 52 53 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) ;53 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 54 54 55 55 bool fire(float* reloadTime); -
code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponPack.h
r9667 r10817 44 44 virtual ~WeaponPack(); 45 45 46 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) ;46 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 47 47 48 48 void fire(unsigned int weaponmode); -
code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSet.h
r9667 r10817 44 44 virtual ~WeaponSet(); 45 45 46 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) ;46 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 47 47 48 48 void fire(); -
code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.h
r10768 r10817 62 62 virtual ~WeaponSlot(); 63 63 64 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) ;64 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 65 65 66 66 void attachWeapon(Weapon * weapon);
Note: See TracChangeset
for help on using the changeset viewer.