diff options
| author | Stijn Buys <ingar@osirion.org> | 2013-11-05 13:17:27 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2013-11-05 13:17:27 +0000 |
| commit | 9a16c4b433bba4837bc98a90b446aa0726f0d447 (patch) | |
| tree | 162f257f40a83ae46eddbe1fa0289b2d3e496e44 /src/game/base/patrol.cc | |
| parent | cbb34af067be07ad28349e64d8670c97785c53c0 (diff) | |
Correct a bug where launch timeout is ignored for patrols with only a single member,
increase dampening for cargo pods,
added 'explode' cheat function to self-destruct,
cleaned up cargo pod eject code,
eject cargo on ship destruction,
added g_cargoloss game variable.
Diffstat (limited to 'src/game/base/patrol.cc')
| -rw-r--r-- | src/game/base/patrol.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/game/base/patrol.cc b/src/game/base/patrol.cc index 48f687e..4ad16df 100644 --- a/src/game/base/patrol.cc +++ b/src/game/base/patrol.cc @@ -347,6 +347,8 @@ void Patrol::frame(const unsigned long elapsed) } else if ((patrol_leader->state() == core::Entity::Normal) || (patrol_leader->state() == core::Entity::ImpulseInitiate) || (patrol_leader->state() == core::Entity::Impulse)) { + patrol_launch_timeout = 0; + if (waypoint()->target()->zone() == patrol_leader->zone()) { patrol_leader->set_autopilot_target(waypoint()->target()); |