From f617213b4a48d73acd245580f8551a7c37ce9ad8 Mon Sep 17 00:00:00 2001
From: tom barrett <spalf0@gmail.com>
Date: Sun, 10 Feb 2019 03:55:05 -0600
Subject: added vector math and tractorbeam module

---
 src/client/navigation.rs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/client/navigation.rs')

diff --git a/src/client/navigation.rs b/src/client/navigation.rs
index 0ab25c6..1f2ed06 100644
--- a/src/client/navigation.rs
+++ b/src/client/navigation.rs
@@ -9,7 +9,6 @@ use std::io::{BufRead, BufReader};
 use std::net::TcpStream;
 
 use crate::mass::{Mass, MassType};
-use crate::math::distance;
 use crate::modules::navigation::Navigation;
 
 pub fn client_navigation(name: String, mut stream: TcpStream, mut buff_r: BufReader<TcpStream>) {
@@ -38,14 +37,12 @@ pub fn client_navigation(name: String, mut stream: TcpStream, mut buff_r: BufRea
                 let target_data = get_target_status(&navigation, &mass_name);
                 write!(
                     stdout,
-                    "{}{}) {} ({:.2}, {:.2}, {:.2}) Distance : {:.2} {}",
+                    "{}{}) {} {} Distance : {:.2} {}",
                     termion::cursor::Goto(1, 2 + i as u16),
                     i,
                     mass_name,
-                    mass.position.0,
-                    mass.position.1,
-                    mass.position.2,
-                    distance(mass.position, ship.position),
+                    mass.position,
+                    mass.position.distance_from(ship.position.clone()),
                     target_data
                 )
                 .unwrap();
@@ -79,6 +76,6 @@ fn get_target_status(navigation: &Navigation, mass_name: &str) -> String {
                 String::new()
             }
         }
-        _ => String::new(),
+        None => String::new(),
     }
 }
-- 
cgit v1.2.3