diff options
Diffstat (limited to 'src/fleet.rs')
| -rw-r--r-- | src/fleet.rs | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/src/fleet.rs b/src/fleet.rs index 39558cd..344aef3 100644 --- a/src/fleet.rs +++ b/src/fleet.rs @@ -15,8 +15,6 @@ use crate::ui::fleet_window::NewFleet; pub type FleetId = usize; -pub const FLEET_TICK_DURATION: Second = timeman::HOUR; - pub struct Fleet { id: FleetId, @@ -56,8 +54,6 @@ impl StaticOrbiter for Fleet { impl Fleet { - pub const TICK_DURATION: Second = FLEET_TICK_DURATION; - pub fn new( id: FleetId, name: String) @@ -191,32 +187,7 @@ impl FleetsManager time_now: Second) -> Result<(), Second> { - let tick_interval = Fleet::TICK_DURATION; - - let time_then_offset = time_then % tick_interval; - let time_now_offset = time_now % tick_interval; - - let tick_start = time_then + tick_interval - time_then_offset; - let tick_end = time_now - time_now_offset; - - let num_ticks = (tick_end - tick_start) / tick_interval; - let mut tick_interrupt: Option<Second> = None; - - for tick_i in 0..num_ticks+1 { - let tick_time = tick_start + tick_i * tick_interval; - if self.subtick_fleet(star_systems, tick_time).is_err() { - tick_interrupt = Some(tick_time); - } - } - - let final_tick = match tick_interrupt { - Some(v) => v, - None => tick_end - }; - - if final_tick != tick_end { - self.subtick_fleet(star_systems, final_tick); - } + self.subtick_fleet(star_systems, time_now); Ok(()) } |