tweaks
changed placeholder player name, suppressed some dead code warnings
This commit is contained in:
parent
51060f1a85
commit
b6522d42c3
4 changed files with 6 additions and 5 deletions
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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};
|
||||
|
|
|
|||
|
|
@ -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::<SimpleMarker<SerializeMe>>()
|
||||
.build()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue