diff options
| author | Stijn Buys <ingar@osirion.org> | 2013-09-27 21:12:53 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2013-09-27 21:12:53 +0000 |
| commit | ea7c9d3b78db9b40144f5979c1de033b6d06ba98 (patch) | |
| tree | 9533e7bd93c9eb02cfb7dc795f2bd4bf1e2d110b /src/game/base/shipmodel.cc | |
| parent | 6ae26b0fabe80dfbc4e3e50309a94ff1149343ea (diff) | |
Adds a default armor setting to ship templates.
Diffstat (limited to 'src/game/base/shipmodel.cc')
| -rw-r--r-- | src/game/base/shipmodel.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/game/base/shipmodel.cc b/src/game/base/shipmodel.cc index 7d54ee2..b0f29ef 100644 --- a/src/game/base/shipmodel.cc +++ b/src/game/base/shipmodel.cc @@ -138,10 +138,15 @@ bool ShipModel::init() if (!entitytemplate) { inifile.unknown_error("unkown template '" + str + "'"); } else { + // apply the template settings to the shipmodel shipmodel->set_template(entitytemplate); if (entitytemplate->radius()) { shipmodel->set_radius(entitytemplate->radius()); } + + if (entitytemplate->maxarmor()) { + shipmodel->set_maxarmor(entitytemplate->maxarmor()); + } } } else { inifile.unknown_key(); @@ -410,7 +415,7 @@ void ShipModel::apply(Ship *ship) const ship->set_strafe_force(strafe_force()); ship->set_turn_force(turn_force()); ship->set_roll_force(roll_force()); - ship->set_jumpdrive(jumpdrive()); + ship->set_jumpdrive(jumpdrive()); ship->set_maxarmor(maxarmor()); } |