From 4d1eb2ff20ac86533355702684bd69fe1ab46a8a Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 12 Oct 2023 13:22:01 +0200 Subject: a --- src/path-search-dijkstra.cpp | 2 +- src/point.hpp | 2 +- src/world.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/path-search-dijkstra.cpp b/src/path-search-dijkstra.cpp index 994ca0ee..2ff87b00 100644 --- a/src/path-search-dijkstra.cpp +++ b/src/path-search-dijkstra.cpp @@ -148,7 +148,7 @@ size_t astar::edge_hash::operator()(const edge& e) const #endif } -bool astar::edge::operator==(const floormat::astar::edge& other) const = default; +bool astar::edge::operator==(const astar::edge& other) const = default; #endif path_search_result astar::Dijkstra(world& w, point from_, point to_, object_id own_id, uint32_t max_dist, diff --git a/src/point.hpp b/src/point.hpp index abf50501..10963c22 100644 --- a/src/point.hpp +++ b/src/point.hpp @@ -48,7 +48,7 @@ constexpr point::point(global_coords coord, Vector2b offset) : point{coord.chunk constexpr point::point(chunk_coords_ coord, local_coords tile, Vector2b offset) : cx{coord.x}, cy{coord.y}, cz{coord.z}, tile{tile}, _offset{offset} {} -constexpr point::point(const floormat::point& other) = default; +constexpr point::point(const point& other) = default; constexpr point& point::operator=(const point& other) = default; constexpr bool point::operator==(const point&) const noexcept = default; diff --git a/src/world.cpp b/src/world.cpp index 9b19aed4..5f2bb870 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -192,7 +192,7 @@ void world::throw_on_wrong_object_type(object_id id, object_type actual, object_ fm_throw("object '{}' has wrong object type '{}', should be '{}'"_cf, id, (size_t)actual, (size_t)expected); } -auto world::neighbors(floormat::chunk_coords_ coord) -> std::array +auto world::neighbors(chunk_coords_ coord) -> std::array { std::array ret; for (auto i = 0uz; const auto& x : neighbor_offsets) -- cgit v1.2.3