diff options
| author | Stijn Buys <ingar@osirion.org> | 2012-11-18 15:10:37 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2012-11-18 15:10:37 +0000 |
| commit | ab61530779c73e7e145193efcb1e23a47c16e7f3 (patch) | |
| tree | 9aed75947be45585cf884effc3a59575a1b1bb8e /src/game/base/shipmodel.cc | |
| parent | 69b0cd536aee5cf948e5a97af4df3dd75a545bd0 (diff) | |
Implements server-side ship damage,
adds a damage key to the weapons.ini file,
configurable spacemine damage.
Diffstat (limited to 'src/game/base/shipmodel.cc')
| -rw-r--r-- | src/game/base/shipmodel.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/game/base/shipmodel.cc b/src/game/base/shipmodel.cc index 6e21d91..fe8889d 100644 --- a/src/game/base/shipmodel.cc +++ b/src/game/base/shipmodel.cc @@ -92,9 +92,9 @@ bool ShipModel::init() } else if (inifile.got_key_bool("dock", b)) { shipmodel->set_dockable(b); continue; - } else if (inifile.got_key_float("maxspeed", f)) { - shipmodel->set_maxspeed(f * 0.01f); - continue; +// } else if (inifile.got_key_float("maxspeed", f)) { +// shipmodel->set_maxspeed(f * 0.01f); +// continue; } else if (inifile.got_key_float("impulse", f)) { shipmodel->set_impulse_force(f); continue; @@ -113,6 +113,9 @@ bool ShipModel::init() } else if (inifile.got_key_float("mass", f)) { shipmodel->set_mass(f); continue; + } else if (inifile.got_key_float("armor", f)) { + shipmodel->set_maxarmor(f); + continue; } else if (inifile.got_key_float("radius", f)) { shipmodel->set_radius(f); continue; @@ -196,7 +199,7 @@ void ShipModel::done() ShipModel::ShipModel() : core::Info(shipmodel_infotype) { - shipmodel_maxspeed = 0; + //shipmodel_maxspeed = 0; //default specifications shipmodel_radius = 0.0f; @@ -211,6 +214,7 @@ ShipModel::ShipModel() : core::Info(shipmodel_infotype) shipmodel_roll_force = 1.0f; shipmodel_maxcargo = 0.0f; + shipmodel_maxarmor = 100.0f; shipmodel_jumpdrive = false; // no jumpdrive capability shipmodel_dockable = false; // not dockable @@ -392,6 +396,7 @@ void ShipModel::apply(Ship *ship) const ship->set_turn_force(turn_force()); ship->set_roll_force(roll_force()); ship->set_jumpdrive(jumpdrive()); + ship->set_maxarmor(maxarmor()); } } |