Merge branch '50-pom-diagonal-movement-bug' into 'dev'

fix: Pom diagonal movement #50

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!6
This commit is contained in:
Dominik Bernroider
2025-11-24 12:38:13 +00:00
2 changed files with 5 additions and 3 deletions

View File

@@ -53,10 +53,11 @@ fn handle_move(
) {
for message in move_messages.read() {
for (grid_pos, mut path_queue) in pom_query.iter_mut() {
let start = (grid_pos.x, grid_pos.y);
let grid_start = (grid_pos.x, grid_pos.y);
let start = path_queue.steps.front().unwrap_or(&grid_start);
let end = (message.x, message.y);
match find_path(start, end, &grid, &tile_query) {
match find_path(*start, end, &grid, &tile_query) {
Some(new_path) => {
path_queue.steps = new_path;
}
@@ -65,7 +66,7 @@ fn handle_move(
"Cannot move to ({}, {}). Path blocked or invalid.",
message.x, message.y
);
dbg!(msg);
dbg!(&msg);
invalid_move_messages.write(InvalidMoveMessage { message: msg });
}
}

View File

@@ -64,6 +64,7 @@ pub fn find_path(
path.push_front(curr);
curr = *came_from.get(&curr).unwrap();
}
path.push_front(start);
return Some(path);
}