Changeset 10817 for code/branches/cpp11_v2/src/orxonox/items
- Timestamp:
- Nov 19, 2015, 11:40:28 AM (10 years ago)
- Location:
- code/branches/cpp11_v2/src/orxonox/items
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/orxonox/items/Engine.h
r10765 r10817 59 59 virtual ~Engine(); 60 60 61 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) ;61 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 62 62 void setConfigValues(); 63 63 -
code/branches/cpp11_v2/src/orxonox/items/MultiStateEngine.h
r9667 r10817 52 52 virtual ~MultiStateEngine(); 53 53 54 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) ;54 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 55 55 56 virtual void run(float dt) ;56 virtual void run(float dt) override; 57 57 58 virtual void addToSpaceShip(SpaceShip* ship) ;58 virtual void addToSpaceShip(SpaceShip* ship) override; 59 59 60 60 void addEffectContainer(EffectContainer* effect); -
code/branches/cpp11_v2/src/orxonox/items/PartDestructionEvent.h
r10262 r10817 100 100 virtual ~PartDestructionEvent(); 101 101 102 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) ;102 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 103 103 104 104 void execute(); -
code/branches/cpp11_v2/src/orxonox/items/ShipPart.h
r10624 r10817 47 47 virtual ~ShipPart(); 48 48 49 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) ;49 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 50 50 51 51 virtual void handleHit(float damage, float healthdamage, float shielddamage, Pawn* originator);
Note: See TracChangeset
for help on using the changeset viewer.