Very minor fine-tuning to OrderQueue

src/components.rs

@@ -89,13 +89,22 @@ pub struct OrderQueue {
 }
 
 impl OrderQueue {
-    /// Better to wrap a component creation in a function
-    pub fn new(orders: Vec<UnitOrder>) -> Self {
+    /// Create an empty OrderQueue
+    pub fn new() -> Self {
+        OrderQueue {
+            orders: VecDeque::new(),
+        }
+    }
+}
+
+impl From<Vec<UnitOrder>> for OrderQueue {
+    fn from(orders: Vec<UnitOrder>) -> Self {
         OrderQueue {
             orders: VecDeque::from(orders),
         }
     }
 }
+
 /// Items available to buy
 #[derive(PartialEq, Eq, Copy, Clone, Debug)]
 pub struct ShelfItem(pub Items, pub i32);

src/systems/order_generation.rs

@@ -27,7 +27,7 @@ pub fn order_generation_system(
                             oq.orders.push_back(UnitOrder::MovetoPoint(*pos));
                         } else {
                             order_queue
-                                .insert(*e, OrderQueue::new(vec![UnitOrder::MovetoPoint(*pos)]));
+                                .insert(*e, OrderQueue::from(vec![UnitOrder::MovetoPoint(*pos)]));
                         }
                     }
                 }
@@ -40,7 +40,7 @@ pub fn order_generation_system(
                         } else {
                             order_queue.insert(
                                 *e,
-                                OrderQueue::new(vec![UnitOrder::MovetoUnit(trg_e[0].clone())]),
+                                OrderQueue::from(vec![UnitOrder::MovetoUnit(trg_e[0].clone())]),
                             );
                         }
                     }
@@ -52,7 +52,7 @@ pub fn order_generation_system(
                             oq.orders.push_back(UnitOrder::AMovetoPoint(*pos));
                         } else {
                             order_queue
-                                .insert(*e, OrderQueue::new(vec![UnitOrder::AMovetoPoint(*pos)]));
+                                .insert(*e, OrderQueue::from(vec![UnitOrder::AMovetoPoint(*pos)]));
                         }
                     }
                 }
@@ -70,7 +70,7 @@ pub fn order_generation_system(
                         oq.orders.clear();
                         oq.orders.push_back(UnitOrder::HoldPosition);
                     } else {
-                        order_queue.insert(*e, OrderQueue::new(vec![UnitOrder::HoldPosition]));
+                        order_queue.insert(*e, OrderQueue::from(vec![UnitOrder::HoldPosition]));
                     }
                 }
             }
@@ -80,7 +80,7 @@ pub fn order_generation_system(
                     if let Some(oq) = order_queue.get_mut(*e) {
                         oq.orders.clear();
                     } else {
-                        order_queue.insert(*e, OrderQueue::new(vec![]));
+                        order_queue.insert(*e, OrderQueue::new());
                     }
                 }
             }

src/systems/spawn_creep.rs

@@ -34,7 +34,7 @@ pub fn spawn_creep_system(
 
             // Spawn with Hold position order. To stop leaders when game mode is changed to micro-input.
             // order_queue.insert(creep, OrderQueue::new(vec![UnitOrder::HoldPosition]));
-            order_queue.insert(creep, OrderQueue::new(vec![]));
+            order_queue.insert(creep, OrderQueue::new());
 
             sprites.insert(
                 creep,

src/systems/spawn_leader.rs

@@ -59,7 +59,7 @@ pub fn spawn_leader_system(
 
             // Spawn with Hold position order. To stop leaders when game mode is changed to micro-input.
             // order_queue.insert(leader, OrderQueue::new(vec![UnitOrder::HoldPosition]));
-            order_queue.insert(leader, OrderQueue::new(vec![]));
+            order_queue.insert(leader, OrderQueue::new());
 
             skillsets.insert(
                 leader,