src/{world,dijkstra}: get rid of extra indirection in neighbor list

1 files changed, 4 insertions, 7 deletions

diff --git a/src/dijkstra.cpp b/src/dijkstra.cpp
index d303960a..9fa348b3 100644
--- a/src/dijkstra.cpp
+++ b/src/dijkstra.cpp
@@ -487,15 +487,12 @@ chunk* cache::try_get_chunk(world& w, floormat::chunk_coords_ ch)
         return page.chunk;
 }
 
-std::array<world::neighbor_pair, 8> cache::get_neighbors(world& w, chunk_coords_ ch0)
+std::array<chunk*, 8> cache::get_neighbors(world& w, chunk_coords_ ch0)
 {
     fm_debug_assert(!size.isZero());
-    std::array<world::neighbor_pair, 8> neighbors;
-    for (auto i = 0uz; const auto& x : world::neighbor_offsets)
-    {
-        auto ch = ch0 + x;
-        neighbors[i++] = { try_get_chunk(w, ch), ch0 };
-    }
+    std::array<chunk*, 8> neighbors;
+    for (auto i = 0u; i < 8; i++)
+        neighbors[i] = try_get_chunk(w, ch0 + world::neighbor_offsets[i]);
     return neighbors;
 }