From 2d4644889dafa69c06e284b8b2cd18d2f65e57bc Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Thu, 20 Nov 2025 18:23:20 -0500 Subject: dungeon: refactor player out of entity.rs --- game/src/lib.rs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'game') diff --git a/game/src/lib.rs b/game/src/lib.rs index b6d2fa4..8465ff3 100644 --- a/game/src/lib.rs +++ b/game/src/lib.rs @@ -1,7 +1,4 @@ -use dungeon::{ - Dungeon, UpdateResult, entity::PLAYER_INVENTORY_SIZE, player_input::PlayerInput, - pos::Direction, -}; +use dungeon::{Dungeon, UpdateResult, player_input::PlayerInput, pos::Direction}; use graphics::{Key, Window}; pub struct Game { @@ -66,10 +63,7 @@ impl Game { let use_item = self.window.is_key_pressed(Key::E); let attack = self.window.is_key_pressed(Key::F); let drop = self.window.is_key_pressed(Key::Q); - let inv_slot = (0..PLAYER_INVENTORY_SIZE) - .filter_map(|u16| u8::try_from(u16).ok()) - .find(|u8| self.window.is_key_pressed(Key::Number(*u8 + 1))) - .map(|u8| u8 as usize); + let inv_slot = (0..9).find(|n| self.window.is_key_pressed(Key::Number(*n))); PlayerInput { direction, interact, -- cgit v1.2.3-freya