diff --git a/src/spatial.rs b/src/spatial.rs index 45a1eed..3198006 100644 --- a/src/spatial.rs +++ b/src/spatial.rs @@ -120,6 +120,7 @@ pub fn move_entity(entity: Entity, moving_from: usize, moving_to: usize) { lock.blocked[moving_to].1 = to_blocked; } +#[allow(dead_code)] pub fn remove_entity(entity: Entity, idx: usize) { let mut lock = SPATIAL_MAP.lock().unwrap(); lock.tile_content[idx].retain(|(e, _)| *e != entity); diff --git a/src/trigger_system.rs b/src/trigger_system.rs index 6299424..b9e4c74 100644 --- a/src/trigger_system.rs +++ b/src/trigger_system.rs @@ -89,9 +89,7 @@ impl<'a> System<'a> for TriggerSystem { // If it's a teleporter, then do that if let Some(teleport) = teleporters.get(entity_id) { - if (teleport.player_only && entity == *player_entity) - || !teleport.player_only - { + if !teleport.player_only || entity == *player_entity { apply_teleport .insert( entity,