From 1b84fc144f77c4ebef6fdc0a476410420e0a95b3 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 28 Oct 2022 18:31:18 +0200 Subject: refactoring work --- serialize/world-writer.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'serialize') diff --git a/serialize/world-writer.cpp b/serialize/world-writer.cpp index b28c113b..80c8de4a 100644 --- a/serialize/world-writer.cpp +++ b/serialize/world-writer.cpp @@ -88,7 +88,8 @@ void writer_state::serialize_chunk(const chunk& c, chunk_coords coord) { const tile& x = c[i]; - [[maybe_unused]] constexpr auto tile_size = sizeof(atlasid)*3 + sizeof(tilemeta); + [[maybe_unused]] constexpr auto tile_size = sizeof(tilemeta) + (sizeof(atlasid) + sizeof(imgvar))*3; + fm_debug_assert(s.bytes_written() + tile_size <= chunkbuf_size); auto img_g = maybe_intern_atlas(x.ground_image); @@ -105,12 +106,14 @@ void writer_state::serialize_chunk(const chunk& c, chunk_coords coord) s << flags; + static_assert(std::is_same_v); + if (img_g != null_atlas) - s << img_g; + s << img_g << x.ground_image.variant; if (img_n != null_atlas) - s << img_n; + s << img_n << x.wall_north.variant; if (img_w != null_atlas) - s << img_w; + s << img_w << x.wall_west.variant; } const auto nbytes = s.bytes_written(); -- cgit v1.2.3