From b93ec1eee7d3199ecd1fa8bf2061622ede93a98c Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 28 Oct 2022 03:13:34 +0200 Subject: some random crap --- src/local-coords.hpp | 2 +- src/tile.hpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/local-coords.hpp b/src/local-coords.hpp index 1e7fbbed..2d449aae 100644 --- a/src/local-coords.hpp +++ b/src/local-coords.hpp @@ -28,7 +28,7 @@ requires (sizeof(T) <= sizeof(std::size_t)) constexpr local_coords::local_coords(T x, T y) noexcept : x{(std::uint8_t)x}, y{(std::uint8_t)y} { - fm_assert(static_cast(x) < TILE_MAX_DIM && static_cast(y) < TILE_MAX_DIM); + fm_assert((std::size_t)x < TILE_MAX_DIM && (std::size_t)y < TILE_MAX_DIM); } } // namespace floormat diff --git a/src/tile.hpp b/src/tile.hpp index c49b95b0..e8bac834 100644 --- a/src/tile.hpp +++ b/src/tile.hpp @@ -24,8 +24,7 @@ struct tile_image final struct tile final { - enum class pass_mode : std::uint8_t { pass_blocked, pass_ok, pass_shoot_through, }; - using enum pass_mode; + enum pass_mode : std::uint8_t { pass_blocked, pass_ok, pass_shoot_through, }; tile_image ground_image, wall_north, wall_west; pass_mode passability = pass_shoot_through; -- cgit v1.2.3