summaryrefslogtreecommitdiff
path: root/src/modules/navigation.rs
diff options
context:
space:
mode:
authortom barrett <spalf0@gmail.com>2018-06-28 04:00:48 -0500
committertom barrett <spalf0@gmail.com>2018-06-28 04:00:48 -0500
commit828f0d83dcb258a8e5efd55a7775592c6e5f77bc (patch)
treed99dfba7357a5e2cbf8162fe037f2f0fd5a87482 /src/modules/navigation.rs
parentae79327d4f0ee6de0ef6b8e3c51299aebfe3bc25 (diff)
-moved over it if let from bad matches
Diffstat (limited to 'src/modules/navigation.rs')
-rw-r--r--src/modules/navigation.rs29
1 files changed, 9 insertions, 20 deletions
diff --git a/src/modules/navigation.rs b/src/modules/navigation.rs
index c4b3224..84f315c 100644
--- a/src/modules/navigation.rs
+++ b/src/modules/navigation.rs
@@ -32,19 +32,11 @@ impl Navigation {
}
pub fn process(&mut self) {
- match self.start.clone() {
- Some(timer) => {
- if timer.elapsed().unwrap().as_secs() > self.time {
- self.status = NavigationStatus::Targeted;
- self.start = None;
- }
+ if let Some(timer) = self.start.clone() {
+ if timer.elapsed().unwrap().as_secs() > self.time {
+ self.status = NavigationStatus::Targeted;
+ self.start = None;
}
- _ => (),
- }
-
- match self.target_name {
- None => self.status = NavigationStatus::None,
- _ => (),
}
}
@@ -55,15 +47,12 @@ impl Navigation {
}
pub fn verify_target(&mut self, ship_position : (f64, f64, f64), masses : &HashMap<String, Mass>) {
- match self.target_name.clone() {
- Some(name) => {
- let target = masses.get(&name).unwrap();
- if distance(target.position, ship_position) > self.range {
- self.target_name = None;
- self.status = NavigationStatus::None;
- }
+ if let Some(name) = self.target_name.clone() {
+ let target = masses.get(&name).unwrap();
+ if distance(target.position, ship_position) > self.range {
+ self.target_name = None;
+ self.status = NavigationStatus::None;
}
- _ => (),
}
}
}