diff options
author | Stijn Buys <ingar@osirion.org> | 2014-12-16 20:37:15 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2014-12-16 20:37:15 +0000 |
commit | bebb67e03d378a084367cc05c3d9bbb76f1d8e73 (patch) | |
tree | cd79f728276a9e5805ce29163f055c5103e3577e /src/game/base/ship.h | |
parent | a18281d42e8b4e9b3cf9d987ff980bcfc14344ad (diff) |
Project::OSiRiON can now be built with Clang, use -Wno-overloaded-virtual.
Diffstat (limited to 'src/game/base/ship.h')
-rw-r--r-- | src/game/base/ship.h | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/src/game/base/ship.h b/src/game/base/ship.h index d627295..4b4ae61 100644 --- a/src/game/base/ship.h +++ b/src/game/base/ship.h @@ -99,18 +99,30 @@ public: return ( (ship_autopilot_flags & flag) == flag); } - /// maximum amount of armor + /// maximal armor strength inline const float maxarmor() const { return ship_maxarmor; } - /// current amount of armor + /// current armor strength inline const float armor() const { return ship_armor; } + /// maximal armor strength + inline const float maxshield() const + { + return ship_maxshield; + } + + /// current armor strength + inline const float shield() const + { + return ship_shield; + } + virtual void print() const; /* -- mutators --------------------------------------------- */ @@ -160,19 +172,31 @@ public: ship_roll_force = roll; } - /// set maximal armor amount (100% health) + /// set maximal armor strength (100% health) inline void set_maxarmor(const float maxarmor) { ship_maxarmor = maxarmor; } - /// set current armor amount (current health) + /// set current armor strength (current health) inline void set_armor(const float armor) { ship_armor = armor; } - /// Initiate jump, departing from a jump point + /// set maximal shield strength + inline void set_maxshield(const float maxshield) + { + ship_maxshield = maxshield; + } + + /// set current shield strength + inline void set_shield(const float shield) + { + ship_shield = shield; + } + + /// initiate jump sequence, departing from a jump point void initiate_jump(JumpPoint *depart); /// reset physics state and ship controls |