src/board.rs

@@ -52,10 +52,6 @@ impl Board {
             let x = *x_offset as i8 + x;
             let y = *y_offset as i8 + y;
 
-            if x < 0 || x >= Board::WIDTH as i8 {
-                return true;
-            }
-
             if y < 0 {
                 continue;
             }
@@ -64,6 +60,10 @@ impl Board {
                 return true;
             }
 
+            if x < 0 || x >= Board::WIDTH as i8 {
+                return true;
+            }
+
             if self.0[y as usize][x as usize].is_some() {
                 return true;
             }

src/game.rs

@@ -2,7 +2,6 @@ use crate::actions::{Action, ActionsHeld};
 use crate::board::Board;
 use crate::tetromino::{Direction, DirectionDiff, Tetromino};
 
-#[derive(Debug)]
 pub struct CurrentTetromino {
     pub tetromino: Tetromino,
     pub direction: Direction,
@@ -12,28 +11,12 @@ pub struct CurrentTetromino {
 
 impl CurrentTetromino {
     fn new(tetromino: Tetromino) -> Self {
-        let width = tetromino
+        const PIECE_WIDTH: i8 = 2;
-            .pattern(&Direction::Up)
-            .into_iter()
-            .map(|(x, _y)| x)
-            .max()
-            .expect("pattern length > 0")
-            + 1;
-
-        let height = tetromino
-            .pattern(&Direction::Up)
-            .into_iter()
-            .map(|(_x, y)| y)
-            .max()
-            .expect("pattern length > 0")
-            + 1;
-
-        let x = ((Board::WIDTH - width) / 2) as i8;
         Self {
             tetromino,
             direction: Direction::Up,
-            x,
+            x: (Board::WIDTH as i8 - PIECE_WIDTH) / 2,
-            y: -(height as i8),
+            y: -1,
         }
     }
 }
@@ -269,14 +252,7 @@ impl Game {
         let current = std::mem::replace(&mut self.current_tetromino, next);
         let pattern = current.tetromino.pattern(&current.direction);
 
-        let y_start = pattern
+        if current.y <= 0 {
-            .iter()
-            .map(|(_x, y)| *y)
-            .min()
-            .expect("pattern length > 0") as i8;
-
-        let y = current.y + y_start;
-        if y < 0 {
             self.game_over = true;
         }
 

src/gui/sdl.rs

@@ -301,20 +301,18 @@ fn config_from_file<P: AsRef<std::path::Path>>(path: P) -> Result<Config, String
     let Some(config) = fs::read_to_string(path.as_ref()).ok() else {
         let config = Config::default();
         {
-            println!("could not get config! creating default...");
+            println!("could not get config! attempting to create default...");
             let config = toml::to_string(&config).map_err(|err| err.to_string())?;
-            fs::write(path.as_ref(), config).map_err(|err| err.to_string())?;
+            fs::write(path, config).map_err(|err| err.to_string())?;
-            println!("created config at '{}'", path.as_ref().display());
         }
         return Ok(config);
     };
     let Some(config) = toml::from_str(&config).ok() else {
-        println!("womp womp, config contains an invalid config, resetting...");
+        println!("womp womp, config contains an invalid config, attempting to reset to default...");
         let config = Config::default();
         {
             let config = toml::to_string(&config).map_err(|err| err.to_string())?;
-            fs::write(path.as_ref(), config).map_err(|err| err.to_string())?;
+            fs::write(path, config).map_err(|err| err.to_string())?;
-            println!("created config at '{}'", path.as_ref().display());
         }
         return Ok(config);
     };

src/tetromino.rs

@@ -9,7 +9,6 @@ pub enum Tetromino {
     Z,
 }
 
-#[derive(Debug)]
 pub enum Direction {
     Up,
     Right,