diff options
| author | Stijn Buys <ingar@osirion.org> | 2013-11-11 00:41:33 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2013-11-11 00:41:33 +0000 |
| commit | 7bdab72e2ddf145a4692ae92b22110c2e7febe67 (patch) | |
| tree | 1d23b5cd5bdb6770b76e1a68ed651d30d6cab22c /src/game/base/ship.cc | |
| parent | 8039544940b6145dcc8c63bcd4e06073ed61801e (diff) | |
Support for station weapons.
Diffstat (limited to 'src/game/base/ship.cc')
| -rw-r--r-- | src/game/base/ship.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/base/ship.cc b/src/game/base/ship.cc index 368fc11..d947139 100644 --- a/src/game/base/ship.cc +++ b/src/game/base/ship.cc @@ -1131,9 +1131,9 @@ void Ship::frame(const unsigned long elapsed) EntityControlable::frame(elapsed); // fire weapons - if (model() && slots() && (state() == core::Entity::Normal) && has_target_controlflag(core::EntityControlable::ControlFlagFire)) { + if (slots() && (state() == core::Entity::Normal) && has_target_controlflag(core::EntityControlable::ControlFlagFire)) { - const float modelscale = radius() / model()->radius(); + const float modelscale = radius() / (model() ? model()->radius() : 1.0f); for (core::Slots::iterator it = slots()->begin(); it != slots()->end(); it++) { core::Slot *slot = (*it); |