diff --git a/Cargo.lock b/Cargo.lock index f8985f4..da99dd3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -250,7 +250,7 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "marble-machinations" -version = "0.2.1" +version = "0.2.0" dependencies = [ "raylib", "serde", diff --git a/Cargo.toml b/Cargo.toml index a4578e8..1dd6974 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "marble-machinations" -version = "0.2.1" +version = "0.2.0" edition = "2021" [dependencies] diff --git a/src/config.rs b/src/config.rs deleted file mode 100644 index cdcb5a3..0000000 --- a/src/config.rs +++ /dev/null @@ -1,26 +0,0 @@ -use std::collections::HashMap; - -use raylib::ffi::KeyboardKey; -use serde::{Deserialize, Serialize}; - -#[derive(Debug, Default, Deserialize, Serialize)] -pub struct Config { - hotkeys: Hotkeys, -} - -#[derive(Debug, Default, Deserialize, Serialize)] -pub struct Hotkeys { - map: HashMap, -} - -#[derive(Debug, Deserialize, Serialize)] -pub struct Hotkey { - modifiers: Vec, - trigger: Trigger, -} - -#[derive(Debug, Deserialize, Serialize)] -pub enum Trigger { - Mouse(u32), - Key(u32), -} diff --git a/src/marble_engine.rs b/src/marble_engine.rs index e0191fd..402842b 100644 --- a/src/marble_engine.rs +++ b/src/marble_engine.rs @@ -255,17 +255,13 @@ impl Machine { } // #### new marbles #### - let mut claim_positions = Vec::new(); // prepare creating the new marbles for &(pos, _val, _dir) in &new_marbles { let Some(Tile::Open(OpenTile::Blank, claim)) = self.board.get_mut(pos) else { unreachable!() }; *claim = match claim { - Claim::Free => { - claim_positions.push(pos); - Claim::Claimed - } + Claim::Free => Claim::Claimed, Claim::Claimed | Claim::Blocked => Claim::Blocked, _ => unreachable!(), } @@ -281,6 +277,7 @@ impl Machine { } // #### movement #### + let mut claim_positions = Vec::new(); // mark claims to figure out what spaces can be moved to for &pos in &self.marbles[..old_marbles] { let Some(Tile::Marble { value: _, dir }) = self.board.get(pos) else {