pre-declare integer types without cstddef/cstdint

1 files changed, 6 insertions, 6 deletions

diff --git a/src/chunk-collision.cpp b/src/chunk-collision.cpp
index fc7ab92a..fedfd877 100644
--- a/src/chunk-collision.cpp
+++ b/src/chunk-collision.cpp
@@ -11,7 +11,7 @@ chunk::RTree* chunk::rtree() noexcept { ensure_passability(); return &_rtree; }
 
 namespace {
 
-constexpr Vector2 tile_start(std::size_t k)
+constexpr Vector2 tile_start(size_t k)
 {
     constexpr auto half_tile = Vector2(TILE_SIZE2)/2;
     const local_coords coord{k};
@@ -26,27 +26,27 @@ Pair<Vector2i, Vector2i> scenery_tile(local_coords local, Vector2b offset, Vecto
     return { min, min + size, };
 }
 
-constexpr Pair<Vector2, Vector2> whole_tile(std::size_t k)
+constexpr Pair<Vector2, Vector2> whole_tile(size_t k)
 {
     auto min = tile_start(k);
     return { min, min + TILE_SIZE2, };
 }
 
-constexpr Pair<Vector2, Vector2> wall_north(std::size_t k)
+constexpr Pair<Vector2, Vector2> wall_north(size_t k)
 {
     auto min = tile_start(k) - Vector2(0, 1);
     return { min, min + Vector2(TILE_SIZE2[0], 2), };
 }
 
-constexpr Pair<Vector2, Vector2> wall_west(std::size_t k)
+constexpr Pair<Vector2, Vector2> wall_west(size_t k)
 {
     auto min = tile_start(k) - Vector2(1, 0);
     return { min, min + Vector2(2, TILE_SIZE2[1]), };
 }
 
-constexpr std::uint64_t make_id(collision_type type, pass_mode p, std::uint64_t id)
+constexpr object_id make_id(collision_type type, pass_mode p, uint64_t id)
 {
-    return std::bit_cast<std::uint64_t>(collision_data { (std::uint64_t)type, (std::uint64_t)p, id });
+    return std::bit_cast<object_id>(collision_data { (object_id)type, (object_id)p, id });
 }
 
 } // namespace