From bebb67e03d378a084367cc05c3d9bbb76f1d8e73 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Tue, 16 Dec 2014 20:37:15 +0000 Subject: Project::OSiRiON can now be built with Clang, use -Wno-overloaded-virtual. --- src/game/base/shipmodel.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/game/base/shipmodel.cc') 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()); } } -- cgit v1.2.3