From b6522d42c3993b94edfb66bea8c58aa309849238 Mon Sep 17 00:00:00 2001 From: Llywelwyn Date: Sun, 9 Jul 2023 23:08:58 +0100 Subject: [PATCH] tweaks changed placeholder player name, suppressed some dead code warnings --- src/main.rs | 4 ++-- src/particle_system.rs | 1 + src/player.rs | 2 +- src/spawner.rs | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main.rs b/src/main.rs index a4db22f..8c538d0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -279,8 +279,8 @@ fn main() -> rltk::BError { let map = Map::new_map_rooms_and_corridors(); let (player_x, player_y) = map.rooms[0].centre(); - - let player_entity = spawner::player(&mut gs.ecs, player_x, player_y); + let player_name = "wanderer".to_string(); + let player_entity = spawner::player(&mut gs.ecs, player_x, player_y, player_name); gs.ecs.insert(rltk::RandomNumberGenerator::new()); for room in map.rooms.iter().skip(1) { diff --git a/src/particle_system.rs b/src/particle_system.rs index 343519c..afbd8a0 100644 --- a/src/particle_system.rs +++ b/src/particle_system.rs @@ -65,6 +65,7 @@ impl ParticleBuilder { } /// Makes a particle request in the shape of a +. + #[allow(dead_code)] pub fn request_plus(&mut self, x: i32, y: i32, fg: RGB, bg: RGB, glyph: rltk::FontCharType, lifetime: f32) { self.request(x, y, fg, bg, glyph, lifetime * 2.0); self.request(x + 1, y, fg, bg, rltk::to_cp437('─'), lifetime); diff --git a/src/player.rs b/src/player.rs index e8e7d90..e1d98ec 100644 --- a/src/player.rs +++ b/src/player.rs @@ -1,5 +1,5 @@ use super::{ - gamelog::GameLog, gui, CombatStats, Item, Map, Player, Position, RunState, State, Viewshed, WantsToMelee, + gamelog::GameLog, CombatStats, Item, Map, Player, Position, RunState, State, Viewshed, WantsToMelee, WantsToPickupItem, MAPHEIGHT, MAPWIDTH, }; use rltk::{Point, Rltk, VirtualKeyCode}; diff --git a/src/spawner.rs b/src/spawner.rs index a16ad4b..fd44949 100644 --- a/src/spawner.rs +++ b/src/spawner.rs @@ -7,7 +7,7 @@ use specs::prelude::*; use specs::saveload::{MarkedBuilder, SimpleMarker}; /// Spawns the player and returns his/her entity object. -pub fn player(ecs: &mut World, player_x: i32, player_y: i32) -> Entity { +pub fn player(ecs: &mut World, player_x: i32, player_y: i32, player_name: String) -> Entity { ecs.create_entity() .with(Position { x: player_x, y: player_y }) .with(Renderable { @@ -18,7 +18,7 @@ pub fn player(ecs: &mut World, player_x: i32, player_y: i32) -> Entity { }) .with(Player {}) .with(Viewshed { visible_tiles: Vec::new(), range: 12, dirty: true }) - .with(Name { name: "hero (you)".to_string() }) + .with(Name { name: player_name }) .with(CombatStats { max_hp: 30, hp: 30, defence: 2, power: 5 }) .marked::>() .build()