tutorials/roguelike-game
1
0
Fork 0
Code Releases Activity

Fix some lint issues

Browse Source
This commit is contained in:
Timothy Warren 2022-01-19 14:48:10 -05:00
parent 1a95ad5650
commit 892364927a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/spatial.rs
View File

@ -120,6 +120,7 @@ pub fn move_entity(entity: Entity, moving_from: usize, moving_to: usize) {
lock.blocked[moving_to].1 = to_blocked; lock.blocked[moving_to].1 = to_blocked;
} }
#[allow(dead_code)]
pub fn remove_entity(entity: Entity, idx: usize) { pub fn remove_entity(entity: Entity, idx: usize) {
let mut lock = SPATIAL_MAP.lock().unwrap(); let mut lock = SPATIAL_MAP.lock().unwrap();
lock.tile_content[idx].retain(|(e, _)| *e != entity); lock.tile_content[idx].retain(|(e, _)| *e != entity);

4
src/trigger_system.rs
View File

@ -89,9 +89,7 @@ impl<'a> System<'a> for TriggerSystem {
// If it's a teleporter, then do that // If it's a teleporter, then do that
if let Some(teleport) = teleporters.get(entity_id) { if let Some(teleport) = teleporters.get(entity_id) {
if (teleport.player_only && entity == *player_entity) if !teleport.player_only || entity == *player_entity {
|| !teleport.player_only
{
apply_teleport apply_teleport
.insert( .insert(
entity, entity,