From 0b694f21edc97bd95faa65197bdda6b440479df3 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sat, 25 Feb 2023 21:11:18 +0100
Subject: a

---
 src/RTree.h             | 1 +
 src/chunk-collision.cpp | 4 ++--
 src/chunk.hpp           | 8 +++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/RTree.h b/src/RTree.h
index f4139450..04d84863 100644
--- a/src/RTree.h
+++ b/src/RTree.h
@@ -278,6 +278,7 @@ public:
   void ListTree(std::vector<Rect>& vec, std::vector<Node*>& temp) const;
 };
 
+#include <cinttypes>
 extern template class RTree<std::uint64_t, float, 2, float>;
 
 //#undef RTREE_TEMPLATE
diff --git a/src/chunk-collision.cpp b/src/chunk-collision.cpp
index f37fd24b..80436ad2 100644
--- a/src/chunk-collision.cpp
+++ b/src/chunk-collision.cpp
@@ -6,8 +6,8 @@
 
 namespace floormat {
 
-const RTree<std::uint64_t, float, 2, float>* chunk::rtree() const noexcept { return &_rtree; }
-RTree<std::uint64_t, float, 2, float>* chunk::rtree() noexcept { return &_rtree; }
+const chunk::RTree* chunk::rtree() const noexcept { return &_rtree; }
+chunk::RTree* chunk::rtree() noexcept { return &_rtree; }
 
 namespace {
 
diff --git a/src/chunk.hpp b/src/chunk.hpp
index 0cd7dfc7..6ba8ef5e 100644
--- a/src/chunk.hpp
+++ b/src/chunk.hpp
@@ -86,8 +86,10 @@ struct chunk final
 
     void ensure_passability() noexcept;
 
-    const RTree<std::uint64_t, float, 2, float>* rtree() const noexcept;
-    RTree<std::uint64_t, float, 2, float>* rtree() noexcept;
+    using RTree = ::RTree<std::uint64_t, float, 2, float>;
+
+    const RTree* rtree() const noexcept;
+    RTree* rtree() noexcept;
 
 private:
     std::array<std::shared_ptr<tile_atlas>, TILE_COUNT> _ground_atlases;
@@ -102,7 +104,7 @@ private:
 
     GL::Mesh ground_mesh{NoCreate}, wall_mesh{NoCreate}, scenery_mesh{NoCreate};
 
-    RTree<std::uint64_t, float, 2, float> _rtree;
+    RTree _rtree;
 
     mutable bool _maybe_empty      : 1 = true,
                  _ground_modified  : 1 = true,
-- 
cgit v1.2.3