Moved ship placement knowledge out to be one per ship

1 files changed, 2 insertions, 2 deletions

diff --git a/src/actions.rs b/src/actions.rs
index 9009099..2291de6 100644
--- a/src/actions.rs
+++ b/src/actions.rs
@@ -40,7 +40,7 @@ impl ShipPlacement {
         
     pub fn valid(&self, map_size: u16) -> bool {
         let start = self.point;
-        let end = start.move_point(self.direction, self.ship_type.length(), map_size);
+        let end = start.move_point(self.direction, self.ship_type.length() as i32, map_size);
         start.x < map_size && start.y < map_size && end.is_some()
     }
     pub fn valid_placements(placements: &Vec<ShipPlacement>, map_size: u16) -> bool {
@@ -51,7 +51,7 @@ impl ShipPlacement {
         for placement in placements {
             individuals_valid = individuals_valid && placement.valid(map_size);
 
-            for i in 0..placement.ship_type.length() {
+            for i in 0..placement.ship_type.length() as i32 {
                 match placement.point.move_point(placement.direction, i, map_size) {
                     Some(block) => {
                         no_overlaps = no_overlaps && !occupied.contains(&block);