From ab61530779c73e7e145193efcb1e23a47c16e7f3 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 18 Nov 2012 15:10:37 +0000 Subject: Implements server-side ship damage, adds a damage key to the weapons.ini file, configurable spacemine damage. --- src/game/base/shipmodel.h | 112 +++++++++++++++++++++++++++++++--------------- 1 file changed, 77 insertions(+), 35 deletions(-) (limited to 'src/game/base/shipmodel.h') diff --git a/src/game/base/shipmodel.h b/src/game/base/shipmodel.h index f790bcd..243860d 100644 --- a/src/game/base/shipmodel.h +++ b/src/game/base/shipmodel.h @@ -31,72 +31,92 @@ public: /* ---- inspectors ------------------------------------------------ */ /// indicates if this model can be equiped with a jump drive - inline const bool jumpdrive() const { + inline const bool jumpdrive() const + { return shipmodel_jumpdrive; } /// indicates if players can dock this ship model - inline const bool dockable() const { + inline const bool dockable() const + { return shipmodel_dockable; } /// default mass - inline const float mass() const { + inline const float mass() const + { return shipmodel_mass; } /// default impulse drive force - inline const float impulse_force() const { + inline const float impulse_force() const + { return shipmodel_impulse_force; } /// default thruster force - inline const float thrust_force() const { + inline const float thrust_force() const + { return shipmodel_thrust_force; } /// default strafe force - inline const float strafe_force() const { + inline const float strafe_force() const + { return shipmodel_strafe_force; } /// default turn force - inline const float turn_force() const { + inline const float turn_force() const + { return shipmodel_turn_force; } /// default turn force - inline const float roll_force() const { + inline const float roll_force() const + { return shipmodel_roll_force; } /// linear damping factor - inline const float linear_damping() const { + inline const float linear_damping() const + { return shipmodel_linear_damping; } /// angular damping factor - inline const float angular_damping() const { + inline const float angular_damping() const + { return shipmodel_angular_damping; } - /// maximum thrust speed - inline const float maxspeed() const { - return shipmodel_maxspeed; - } +// /// maximum thrust speed +// inline const float maxspeed() const +// { +// return shipmodel_maxspeed; +// } /// size of the cargo hold, in cubic meters - inline const float maxcargo() const { + inline const float maxcargo() const + { return shipmodel_maxcargo; } + /// maximum armor amount + inline const float maxarmor() const + { + return shipmodel_maxarmor; + } + /// ship radius - inline const float radius() const { + inline const float radius() const + { return shipmodel_radius; } /// entity template - inline const Template *model_template() const { + inline const Template *model_template() const + { return shipmodel_template; } @@ -117,77 +137,97 @@ protected: /* ---- mutators -------------------------------------------------- */ /// set mass - inline void set_mass(const float mass) { + inline void set_mass(const float mass) + { shipmodel_mass = mass; } /// set impulse drive force - inline void set_impulse_force(const float impulse) { + inline void set_impulse_force(const float impulse) + { shipmodel_impulse_force = impulse; } /// set thruster force - inline void set_thrust_force(const float thrust) { + inline void set_thrust_force(const float thrust) + { shipmodel_thrust_force = thrust; } /// set strafe force - inline void set_strafe_force(const float strafe) { + inline void set_strafe_force(const float strafe) + { shipmodel_strafe_force = strafe; } /// set turn forceshipmodel_lineardamping - inline void set_turn_force(const float turn) { + inline void set_turn_force(const float turn) + { shipmodel_turn_force = turn; } /// set roll force - inline void set_roll_force(const float roll) { + inline void set_roll_force(const float roll) + { shipmodel_roll_force = roll; } - /// set maximum speed - inline void set_maxspeed(const float maxspeed) { - shipmodel_maxspeed = maxspeed; +// /// set maximum speed +// inline void set_maxspeed(const float maxspeed) +// { +// shipmodel_maxspeed = maxspeed; +// } + + /// set maximum armor amount + inline void set_maxarmor(const float maxarmor) + { + shipmodel_maxarmor = maxarmor; } /// set size of the cargo hold - inline void set_maxcargo(const float maxcargo) { + inline void set_maxcargo(const float maxcargo) + { shipmodel_maxcargo = maxcargo; } /// set jumpdrive capability - inline void set_jumpdrive(const bool jumpdrive) { + inline void set_jumpdrive(const bool jumpdrive) + { shipmodel_jumpdrive = jumpdrive; } /// set dock capability - inline void set_dockable(const bool dockable) { + inline void set_dockable(const bool dockable) + { shipmodel_dockable = dockable; } /// set radius - inline void set_radius(const float radius) { + inline void set_radius(const float radius) + { shipmodel_radius = radius; } /// set entity template - inline void set_template(const Template *model_template) { + inline void set_template(const Template *model_template) + { shipmodel_template = model_template; } /** * @brief set physics linear damping factor */ - inline void set_linear_damping(const float linear_damping) { + inline void set_linear_damping(const float linear_damping) + { shipmodel_linear_damping = linear_damping; } /** * @brief set physics linear damping factor */ - inline void set_angular_damping(const float angular_damping) { + inline void set_angular_damping(const float angular_damping) + { shipmodel_angular_damping = angular_damping; } @@ -226,8 +266,10 @@ private: float shipmodel_turn_force; float shipmodel_roll_force; - float shipmodel_maxspeed; - float shipmodel_maxcargo; +// float shipmodel_maxspeed; + float shipmodel_maxcargo; + float shipmodel_maxarmor; + float shipmodel_maxshield; bool shipmodel_jumpdrive; bool shipmodel_dockable; -- cgit v1.2.3