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/shipmodel.cc | |
| parent | a18281d42e8b4e9b3cf9d987ff980bcfc14344ad (diff) | |
Project::OSiRiON can now be built with Clang, use -Wno-overloaded-virtual.
Diffstat (limited to 'src/game/base/shipmodel.cc')
| -rw-r--r-- | src/game/base/shipmodel.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/game/base/shipmodel.cc b/src/game/base/shipmodel.cc index 9489c91..f504107 100644 --- a/src/game/base/shipmodel.cc +++ b/src/game/base/shipmodel.cc @@ -116,6 +116,9 @@ bool ShipModel::init() } else if (inifile.got_key_float("armor", f)) { shipmodel->set_maxarmor(f); continue; + } else if (inifile.got_key_float("shield", f)) { + shipmodel->set_maxshield(f); + continue; } else if (inifile.got_key_float("radius", f)) { shipmodel->set_radius(f); continue; @@ -433,6 +436,7 @@ void ShipModel::apply(Ship *ship) const ship->set_roll_force(roll_force()); ship->set_jumpdrive(jumpdrive()); ship->set_maxarmor(maxarmor()); + ship->set_maxshield(maxshield()); } } |