diff options
| author | alf9310 <alf9310@rit.edu> | 2025-10-17 10:30:42 -0400 |
|---|---|---|
| committer | alf9310 <alf9310@rit.edu> | 2025-10-17 10:30:42 -0400 |
| commit | 0915e49c033fcb364feb307e2998a24833f4ae0f (patch) | |
| tree | 9713dccb4920a1645547a3ab2cb7cc31b946c4e2 | |
| parent | Proposal summary and use cases complete (diff) | |
| parent | dungeon: make const_pos! not require name param (diff) | |
| download | DungeonCrawl-0915e49c033fcb364feb307e2998a24833f4ae0f.tar.gz DungeonCrawl-0915e49c033fcb364feb307e2998a24833f4ae0f.tar.bz2 DungeonCrawl-0915e49c033fcb364feb307e2998a24833f4ae0f.zip | |
Merge branch 'main' of https://git.gccis.rit.edu/psr2251/project/DungeonCrawl
| -rw-r--r-- | dungeon/src/map.rs | 4 | ||||
| -rw-r--r-- | dungeon/src/pos.rs | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/dungeon/src/map.rs b/dungeon/src/map.rs index f5c1184..97bb36c 100644 --- a/dungeon/src/map.rs +++ b/dungeon/src/map.rs @@ -196,7 +196,7 @@ impl Floor { impl Default for Floor { /// Returns a floor with a single set of walls on the map border fn default() -> Self { - const_pos!(PLAYER_START, 1, 1); + let player_start = const_pos!(1, 1); let mut tiles = Box::new([Tile::Air; TILE_COUNT]); let seed = 0u64; @@ -208,7 +208,7 @@ impl Default for Floor { Self { tiles, - player_start: PLAYER_START, + player_start, seed, } } diff --git a/dungeon/src/pos.rs b/dungeon/src/pos.rs index a1de65e..4947ce2 100644 --- a/dungeon/src/pos.rs +++ b/dungeon/src/pos.rs @@ -17,9 +17,10 @@ macro_rules! downcast { #[macro_export] macro_rules! const_pos { - ($name:ident, $x:expr, $y:expr) => { - const $name: Pos = Pos::new_unchecked($x, $y); - }; + ($x:expr, $y:expr) => {{ + const CONST_POS: Pos = Pos::new_unchecked($x, $y); + CONST_POS + }}; } /// The `Direction` type represents a direction an entity @@ -249,7 +250,6 @@ impl Default for Pos { /// ``` /// fn default() -> Self { - const_pos!(DEFAULT, 0, 0); - DEFAULT + const_pos!(0, 0) } } |