summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2024-01-23 08:58:43 +0100
committerStanislaw Halik <sthalik@misaki.pl>2024-01-23 08:59:10 +0100
commit7ba22b6f3748a06f026d0e73a650bc9e10ec2268 (patch)
treecc78643e783b6fd5e0809e4526342191a6662aa6 /src
parent068e5dd08439932604e5ad5d1f22826107a3f308 (diff)
fix clang build
Diffstat (limited to 'src')
-rw-r--r--src/chunk-walls.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/chunk-walls.cpp b/src/chunk-walls.cpp
index 98d12684..6f17fc06 100644
--- a/src/chunk-walls.cpp
+++ b/src/chunk-walls.cpp
@@ -209,7 +209,8 @@ GL::Mesh chunk::make_wall_mesh()
const auto frames = atlas->frames(dir.top);
auto variant = (variant_ != (uint8_t)-1 ? variant_ : vpos);
variant += (uint8_t)(!is_west ? frames.size() - 1 : 1);
- variant = variant % frames.size();
+ fm_assert((size_t)(variant_t)frames.size() == frames.size());
+ variant = variant % (variant_t)frames.size();
constexpr Vector2 half_tile = TILE_SIZE2*.5f;
constexpr float X = half_tile.x(), Y = half_tile.y(), Z = TILE_SIZE.z();
Quads::quad quad = {{
@@ -245,7 +246,8 @@ GL::Mesh chunk::make_wall_mesh()
const auto pos_x = !is_west ? (float)pos.x : (float)pos.x - 1;
const auto depth = tile_shader::depth_value(pos_x, pos.y, depth_offset);
variant += !is_west ? frames.size() - 1 : 1;
- variant = variant % frames.size();
+ fm_assert((size_t)(variant_t)frames.size() == frames.size());
+ variant = variant % (variant_t)frames.size();
const auto& frame = frames[variant];
const auto texcoords = Quads::texcoords_at(frame.offset, frame.size, atlas->image_size());
const auto i = N++;