From 21356ba6adc4df6d56569d4e659fa5eb1ff180e5 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 10 Oct 2023 03:48:18 +0200 Subject: move chunk_coords_ conversion to chunk3() member function --- src/path-search-dijkstra.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/path-search-dijkstra.cpp') diff --git a/src/path-search-dijkstra.cpp b/src/path-search-dijkstra.cpp index 69db2442..77c3d8b6 100644 --- a/src/path-search-dijkstra.cpp +++ b/src/path-search-dijkstra.cpp @@ -216,7 +216,7 @@ path_search_result astar::Dijkstra(world& w, point from_, point to_, object_id o { const auto offset = Vector2b(div_size * Vector2i(x, y)); if (auto bb = bbox_union(start_bbox, from_local, offset, own_size); - path_search::is_passable(w, chunk_coords_{from}, bb, own_id, p)) + path_search::is_passable(w, from.chunk3(), bb, own_id, p)) { indexes[{from, offset}] = idx; nodes.push_back({.dist = from_offset_len, .prev = 0, .coord = from, .offset = offset}); @@ -288,7 +288,7 @@ path_search_result astar::Dijkstra(world& w, point from_, point to_, object_id o { auto vec_ = Vector2(vec); auto bb1 = bbox{ bb0.min + vec_, bb0.max + vec_ }; auto bb = bbox_union(bb1, bb0); - if (!path_search::is_passable(w, chunk_coords_(new_coord), bb, own_id, p)) + if (!path_search::is_passable(w, new_coord.chunk3(), bb, own_id, p)) continue; } #else @@ -300,7 +300,7 @@ path_search_result astar::Dijkstra(world& w, point from_, point to_, object_id o auto bb1 = bbox{ bb0.min + vec_, bb0.max + vec_ }; auto bb = bbox_union(bb1, bb0); - if (path_search::is_passable(w, chunk_coords_(new_coord), bb, own_id, p)) + if (path_search::is_passable(w, new_coord.chunk3(), bb, own_id, p)) status = edge_status::good; else { -- cgit v1.2.3