summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--serialize/world-reader.cpp4
-rw-r--r--serialize/world-writer.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/serialize/world-reader.cpp b/serialize/world-reader.cpp
index 84958109..dc698765 100644
--- a/serialize/world-reader.cpp
+++ b/serialize/world-reader.cpp
@@ -307,11 +307,11 @@ void reader_state::deserialize_world(ArrayView<const char> buf)
(std::size_t)proto, (std::size_t)min_proto_version, (std::size_t)proto_version);
PROTO = proto;
std::uint64_t entity_counter = 0;
- if (PROTO >= 8) [[likely]]
- entity_counter << s;
read_atlases(s);
if (PROTO >= 3) [[likely]]
read_sceneries(s);
+ if (PROTO >= 8) [[likely]]
+ entity_counter << s;
read_chunks(s);
s.assert_end();
if (PROTO >= 8) [[likely]]
diff --git a/serialize/world-writer.cpp b/serialize/world-writer.cpp
index 461f6dd6..f3af1c19 100644
--- a/serialize/world-writer.cpp
+++ b/serialize/world-writer.cpp
@@ -503,9 +503,9 @@ ArrayView<const char> writer_state::serialize_world()
};
copy(Containers::StringView{file_magic, std::size(file_magic)-1});
copy_int((proto_t)proto_version);
- copy_int((std::uint64_t)_world->entity_counter());
copy(atlas_buf);
copy(scenery_buf);
+ copy_int((std::uint64_t)_world->entity_counter());
copy_int((chunksiz)_world->size());
for (const auto& buf : chunk_bufs)
copy(buf);