Remove calls to \.single.
This commit is contained in:
parent
7b1aaf69a2
commit
3cfb638b48
|
@ -265,7 +265,7 @@ fn exploration_focus<S, A: 'static>(
|
||||||
config.action_explore_right.clone(),
|
config.action_explore_right.clone(),
|
||||||
) {
|
) {
|
||||||
for map in map.iter() {
|
for map in map.iter() {
|
||||||
let (entity, coordinates, exploring) = explorers.single();
|
if let Ok((entity, coordinates, exploring)) = explorers.get_single() {
|
||||||
let coordinates = **coordinates;
|
let coordinates = **coordinates;
|
||||||
let mut exploring = if let Some(exploring) = exploring {
|
let mut exploring = if let Some(exploring) = exploring {
|
||||||
**exploring
|
**exploring
|
||||||
|
@ -293,6 +293,7 @@ fn exploration_focus<S, A: 'static>(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn navigate_to_explored<S, A: 'static>(
|
fn navigate_to_explored<S, A: 'static>(
|
||||||
mut commands: Commands,
|
mut commands: Commands,
|
||||||
|
|
|
@ -454,7 +454,6 @@ fn area_description(
|
||||||
})
|
})
|
||||||
{
|
{
|
||||||
if players.get(other).is_ok() {
|
if players.get(other).is_ok() {
|
||||||
let mut log = log.single_mut();
|
|
||||||
if let Ok((aabb, area_name)) = areas.get(area) {
|
if let Ok((aabb, area_name)) = areas.get(area) {
|
||||||
let name = if let Some(name) = area_name {
|
let name = if let Some(name) = area_name {
|
||||||
Some(name.to_string())
|
Some(name.to_string())
|
||||||
|
@ -464,6 +463,7 @@ fn area_description(
|
||||||
None
|
None
|
||||||
};
|
};
|
||||||
if let Some(name) = name {
|
if let Some(name) = name {
|
||||||
|
if let Ok(mut log) = log.get_single_mut() {
|
||||||
if event.intersecting {
|
if event.intersecting {
|
||||||
log.push(format!("Entering {name}."));
|
log.push(format!("Entering {name}."));
|
||||||
} else {
|
} else {
|
||||||
|
@ -475,6 +475,7 @@ fn area_description(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub struct MapPlugin;
|
pub struct MapPlugin;
|
||||||
|
|
||||||
|
|
|
@ -379,7 +379,6 @@ fn log_visible(
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if let Ok((name, body_position, collider_position)) = visible.get(*viewed) {
|
if let Ok((name, body_position, collider_position)) = visible.get(*viewed) {
|
||||||
let mut log = log.single_mut();
|
|
||||||
let viewed_coordinates = if let Some(p) = body_position {
|
let viewed_coordinates = if let Some(p) = body_position {
|
||||||
(p.position.translation.x, p.position.translation.y)
|
(p.position.translation.x, p.position.translation.y)
|
||||||
} else if let Some(p) = collider_position {
|
} else if let Some(p) = collider_position {
|
||||||
|
@ -391,8 +390,10 @@ fn log_visible(
|
||||||
let yaw = Angle::Radians(forward.y.atan2(forward.x));
|
let yaw = Angle::Radians(forward.y.atan2(forward.x));
|
||||||
let location =
|
let location =
|
||||||
viewer_coordinates.direction_and_distance(&viewed_coordinates, Some(yaw));
|
viewer_coordinates.direction_and_distance(&viewed_coordinates, Some(yaw));
|
||||||
|
if let Ok(mut log) = log.get_single_mut() {
|
||||||
log.push(format!("{}: {location}", **name));
|
log.push(format!("{}: {location}", **name));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} else if let VisibilityChanged::Lost { viewed, .. } = event {
|
} else if let VisibilityChanged::Lost { viewed, .. } = event {
|
||||||
recently_lost.insert(*viewed, Timer::from_seconds(2., false));
|
recently_lost.insert(*viewed, Timer::from_seconds(2., false));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user