From 20d2ab63c46d97a9dcc4df848dd728419d0031f9 Mon Sep 17 00:00:00 2001
From: tom barrett <spalf0@gmail.com>
Date: Thu, 5 Apr 2018 08:58:01 -0500
Subject: -changed how everything is referenced by its name now, instead of the
 index, -also added targeting status to the navigation panel

---
 src/ship.rs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/ship.rs')

diff --git a/src/ship.rs b/src/ship.rs
index f97e4d2..4f2a910 100644
--- a/src/ship.rs
+++ b/src/ship.rs
@@ -5,7 +5,7 @@ use mass::{Mass, Type};
 extern crate serde_json;
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
-enum TargetingStatus {
+pub enum TargetingStatus {
     None,
     Targeting,
     Targeted,
@@ -13,7 +13,7 @@ enum TargetingStatus {
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 struct Targeting {
-    target  : Option<usize>,
+    target  : Option<String>,
     status  : TargetingStatus,
     time    : u64,
     start   : Option<SystemTime>,
@@ -87,7 +87,7 @@ impl Ship {
         self.r
     }
 
-    pub fn give_target(&mut self, target : Option<usize>) {
+    pub fn give_target(&mut self, target : Option<String>) {
         self.targeting.target = target;
         match self.targeting.target {
             Some(_) => {
@@ -101,11 +101,12 @@ impl Ship {
         }
     }
 
-    pub fn recv_target(&self) -> Option<usize> {
-        match self.targeting.status {
-            TargetingStatus::Targeted => self.targeting.target,
-            _ => None
-        }
+    pub fn recv_target(&self) -> Option<String> {
+        self.targeting.target.clone()
+    }
+
+    pub fn recv_target_status(&self) -> TargetingStatus {
+        self.targeting.status.clone()
     }
 
     pub fn get_modules(&self) -> String {
-- 
cgit v1.2.3