add check for draw

game/entity.rs

@@ -1,22 +1,17 @@
 #[derive(Clone, Copy, PartialEq)]
-//pub struct Cell(u8);
-//pub const Cell::CellEmpty: Cell = Cell(0);
-//pub const Cell::CellX: Cell = Cell(1);
-//pub const Cell::CellO: Cell = Cell(2);
-
 pub enum Cell {
-    CellEmpty,
-    CellX,
-    CellO,
+    Empty,
+    X,
+    O,
 }
 
 impl std::fmt::Display for Cell {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         let s: &str;
         match *self {
-            Cell::CellX => s = "X",
-            Cell::CellO => s = "O",
-            Cell::CellEmpty => s = " ",
+            Cell::X => s = "X",
+            Cell::O => s = "O",
+            Cell::Empty => s = " ",
         }
 
         write!(f, "{}", s)
@@ -36,18 +31,18 @@ pub struct Board {
 
 impl Board {
     pub fn new() -> Board {
-        return Board {
-            cells: vec![Cell::CellEmpty; 9],
-            next: Cell::CellX,
-        };
+        Board {
+            cells: vec![Cell::Empty; 9],
+            next: Cell::X,
+        }
     }
 
     pub fn reset(&mut self) {
-        self.cells = vec![Cell::CellEmpty; 9];
-        self.next = Cell::CellX;
+        self.cells = vec![Cell::Empty; 9];
+        self.next = Cell::X;
     }
 
-    pub fn put(&mut self, m: Move) -> Result<(), &str> {
+    pub fn apply(&mut self, m: Move) -> Result<(), &str> {
         let i = m.x * 1 + m.y * 3;
 
         if !self.is_valid_move(&m) {
@@ -57,8 +52,8 @@ impl Board {
         self.cells[i] = m.piece;
 
         match self.next {
-            Cell::CellX => self.next = Cell::CellO,
-            Cell::CellO => self.next = Cell::CellX,
+            Cell::X => self.next = Cell::O,
+            Cell::O => self.next = Cell::X,
             _ => {}
         }
 
@@ -68,41 +63,45 @@ impl Board {
     pub fn is_valid_move(&self, m: &Move) -> bool {
         let i = m.x * 1 + m.y * 3;
 
-        m.piece == self.next && self.cells[i] == Cell::CellEmpty
+        m.piece == self.next && self.cells[i] == Cell::Empty
+    }
+
+    pub fn valid_moves_available(&self) -> bool {
+        // check for draw condition
+        let mut empty: usize = 0;
+        for i in 0..self.cells.len() {
+            if self.cells[i] == Cell::Empty {
+                empty += 1;
+            }
+        }
+
+        empty > 0
     }
 
     pub fn has_winner(&self) -> Option<Cell> {
         // rows and cols
         for i in 0..3 {
-            if (self.cells[i] == self.cells[i + 3] && self.cells[i] == self.cells[i + 6])
-                && (self.cells[i] != Cell::CellEmpty
-                    && self.cells[i + 3] != Cell::CellEmpty
-                    && self.cells[i + 6] != Cell::CellEmpty)
+            if (self.cells[i] != Cell::Empty)
+                && (self.cells[i] == self.cells[i + 3] && self.cells[i] == self.cells[i + 6])
             {
                 return Some(self.cells[i]);
-            } else if (self.cells[i * 3] == self.cells[i * 3 + 1]
-                && self.cells[i * 3] == self.cells[i * 3 + 2])
-                && (self.cells[i * 3] != Cell::CellEmpty
-                    && self.cells[i * 3 + 1] != Cell::CellEmpty
-                    && self.cells[i * 3 + 2] != Cell::CellEmpty)
+            } else if (self.cells[i * 3] != Cell::Empty)
+                && (self.cells[i * 3] == self.cells[i * 3 + 1]
+                    && self.cells[i * 3] == self.cells[i * 3 + 2])
             {
                 return Some(self.cells[i * 3]);
             }
         }
 
         // diagonals
-        if (self.cells[0] == self.cells[4] && self.cells[0] == self.cells[8])
-            && (self.cells[0] != Cell::CellEmpty
-                && self.cells[4] != Cell::CellEmpty
-                && self.cells[8] != Cell::CellEmpty)
+        if (self.cells[0] != Cell::Empty)
+            && (self.cells[0] == self.cells[4] && self.cells[0] == self.cells[8])
         {
             return Some(self.cells[0]);
         }
 
-        if (self.cells[2] == self.cells[4] && self.cells[2] == self.cells[6])
-            && (self.cells[2] != Cell::CellEmpty
-                && self.cells[4] != Cell::CellEmpty
-                && self.cells[6] != Cell::CellEmpty)
+        if (self.cells[2] != Cell::Empty)
+            && (self.cells[2] == self.cells[4] && self.cells[2] == self.cells[6])
         {
             return Some(self.cells[2]);
         }
@@ -140,7 +139,10 @@ impl std::fmt::Display for Board {
 
         match self.has_winner() {
             Some(w) => s.push_str(&format!("The winner is {w}")),
-            None => s.push_str(&format!("Next: {}", self.next)),
+            None => match self.valid_moves_available() {
+                true => s.push_str(&format!("Next: {}", self.next)),
+                false => s.push_str("DRAW!"),
+            },
         }
 
         write!(f, "{s}")