diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2022-10-29 00:54:19 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2022-10-29 00:54:19 +0200 |
commit | b6a42cc53f808c86342d1bcd400ea95e6e7f5762 (patch) | |
tree | cd65334638415d037e5544c9af5142eab3d6bc7a /serialize/world-writer.cpp | |
parent | 9954b8b4f5fb95470e127a4f24a0c73289dd49a9 (diff) |
serializer work
Diffstat (limited to 'serialize/world-writer.cpp')
-rw-r--r-- | serialize/world-writer.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/serialize/world-writer.cpp b/serialize/world-writer.cpp index faf60849..e1750fb2 100644 --- a/serialize/world-writer.cpp +++ b/serialize/world-writer.cpp @@ -39,7 +39,7 @@ private: std::unordered_map<const void*, interned_atlas> tile_images;
};
-constexpr auto tile_size = sizeof(tilemeta) + sizeof(atlasid)*3;
+constexpr auto tile_size = sizeof(tilemeta) + (sizeof(atlasid) + sizeof(imgvar))*3;
constexpr auto chunkbuf_size =
sizeof(chunk_magic) + sizeof(chunk_coords) + tile_size * TILE_COUNT;
@@ -88,8 +88,6 @@ void writer_state::serialize_chunk(const chunk& c, chunk_coords coord) {
const tile& x = c[i];
- [[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);
@@ -145,6 +143,7 @@ void writer_state::serialize_atlases() s << sz2[0]; s << sz2[1];
s.write_asciiz_string(name);
}
+ atlas_buf.resize(s.bytes_written());
fm_assert(s.bytes_written() <= atlasbuf_size);
}
|