fleets

1 files changed, 13 insertions, 2 deletions

diff --git a/src/window.rs b/src/window.rs
index d895040..29c347f 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -75,7 +75,11 @@ impl GameWindow
             None => { return; }
         };
 
-        self.tactical_map.update(current_system, &mut self.ui_state, dt);
+        self.tactical_map.update(
+            current_system, 
+            &mut self.ui_state, 
+            game_state.timeman().seconds(),
+            dt);
     }
 
     pub fn keyboard_input(
@@ -105,10 +109,12 @@ impl GameWindow
         self.ui_state.render(game_state, &self.eguictx);
         if self.ui_state.topbar_sate.current_system.is_some() {
             let game_state = game_state.borrow();
+            let fleets_manager = game_state.fleets();
             let current_system = &game_state.solar_systems()[self.ui_state.topbar_sate.current_system.unwrap()];
 
             self.tactical_map.draw(
                 &self.wgpuctx,
+                fleets_manager,
                 current_system,
                 game_state.timeman())?;
 
@@ -124,7 +130,12 @@ impl GameWindow
             egui::CentralPanel::default()
                 .frame(egui::Frame::new())
                 .show(self.eguictx.context(), |ui| {
-                    self.tactical_map.paint_labels(current_system, screen_size, ui);
+                    self.tactical_map.paint_labels(
+                        current_system,
+                        game_state.timeman().seconds(),
+                        screen_size, 
+                        ui
+                    );
                 });
         }
         self.eguictx.present(