tacmap back as canvas. begin work on fleet scheduling

1 files changed, 8 insertions, 5 deletions

diff --git a/src/main.rs b/src/main.rs
index 68ecd55..e4d0518 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -25,6 +25,7 @@ use winit::window::WindowId;
 use solar_system::*;
 
 use crate::fleet::FleetsManager;
+use crate::fleet::schedule::ScheduleManager;
 use crate::timeman::TimeMan;
 use crate::window::GameWindow;
 
@@ -44,7 +45,8 @@ struct GameState
 {
     timeman: TimeMan,
     solar_systems: Vec<SolarSystem>,
-    fleets: FleetsManager
+    fleets: FleetsManager,
+    scheduler: ScheduleManager,
 }
 
 impl SystemicApp
@@ -75,7 +77,8 @@ impl GameState
         Self {
             timeman: timeman,
             solar_systems: vec![ sol_system ],
-            fleets: FleetsManager::new()
+            fleets: FleetsManager::new(),
+            scheduler: ScheduleManager::new()
         }
     }
 
@@ -105,9 +108,9 @@ impl GameState
         if time_then == self.timeman.seconds() { return; }
 
         self.fleets.tick(
-            &self.solar_systems, 
-            time_then, 
-            self.timeman.seconds());
+            &self.solar_systems,
+            &mut self.scheduler,
+            time_then..self.timeman.seconds());
     }
 }