From 4d9a82b720c8ce74b94f43f72ddd819ef21abbdf Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 18 Mar 2023 23:42:07 +0100 Subject: pre-declare integer types without cstddef/cstdint --- src/chunk-collision.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/chunk-collision.cpp') 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 scenery_tile(local_coords local, Vector2b offset, Vecto return { min, min + size, }; } -constexpr Pair whole_tile(std::size_t k) +constexpr Pair whole_tile(size_t k) { auto min = tile_start(k); return { min, min + TILE_SIZE2, }; } -constexpr Pair wall_north(std::size_t k) +constexpr Pair wall_north(size_t k) { auto min = tile_start(k) - Vector2(0, 1); return { min, min + Vector2(TILE_SIZE2[0], 2), }; } -constexpr Pair wall_west(std::size_t k) +constexpr Pair 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(collision_data { (std::uint64_t)type, (std::uint64_t)p, id }); + return std::bit_cast(collision_data { (object_id)type, (object_id)p, id }); } } // namespace -- cgit v1.2.3