diff options
| -rw-r--r-- | entity/name-of.hpp | 3 | ||||
| -rw-r--r-- | src/chunk-walls.cpp | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/entity/name-of.hpp b/entity/name-of.hpp index fcde3d46..ea65b52f 100644 --- a/entity/name-of.hpp +++ b/entity/name-of.hpp @@ -9,9 +9,8 @@ #endif template<typename T> -static constexpr auto _fm_internal_type_name_of() +static constexpr auto _fm_internal_type_name_of() // NOLINT(bugprone-reserved-identifier) { - // NOLINT(bugprone-reserved-identifier) using namespace floormat; using SVF = StringViewFlag; constexpr auto my_strlen = [](const char* str) constexpr -> size_t { diff --git a/src/chunk-walls.cpp b/src/chunk-walls.cpp index c1214cb4..fb4b6560 100644 --- a/src/chunk-walls.cpp +++ b/src/chunk-walls.cpp @@ -143,9 +143,9 @@ Wall::Frame variant_from_frame(ArrayView<const Wall::Frame> frames, global_coord { auto sz = (unsigned)frames.size(); if (variant == (variant_t)-1) - variant = (variant_t)(Vector2ui(coord.raw()).sum() + is_west); + variant = (variant_t)(Vector2ui(coord.raw()).sum() + uint32_t{is_west}); variant %= sz; - return frames[(variant_t)variant]; + return frames[variant]; } } // namespace @@ -320,7 +320,7 @@ GL::Mesh chunk::make_wall_mesh() tile_shader::Position{}, tile_shader::TextureCoordinates{}, tile_shader::Depth{}) .setIndexBuffer(GL::Buffer{index_view}, 0, GL::MeshIndexType::UnsignedShort) .setCount(int32_t(6 * N)); - fm_debug_assert((size_t)mesh.count() == N*6); + fm_debug_assert((uint32_t)mesh.count() == N*6); return mesh; } |