diff options
Diffstat (limited to 'serialize')
| -rw-r--r-- | serialize/world-reader.cpp | 17 | ||||
| -rw-r--r-- | serialize/world-writer.cpp | 15 |
2 files changed, 20 insertions, 12 deletions
diff --git a/serialize/world-reader.cpp b/serialize/world-reader.cpp index 78e7e539..e9d4bc96 100644 --- a/serialize/world-reader.cpp +++ b/serialize/world-reader.cpp @@ -214,14 +214,13 @@ void reader_state::read_chunks(reader_t& s) } } global_coords coord{ch, local_coords{i}}; - auto e = _world->make_entity<scenery>(coord, sc); - c.add_entity_unsorted(e); + auto e = _world->make_entity<scenery, false>(_world->make_id(), coord, sc); } } - if (PROTO < 8) [[unlikely]] - c.sort_entities(); + std::uint32_t entity_count = 0; + if (PROTO >= 8) [[likely]] + entity_count << s; - std::uint32_t entity_count; entity_count << s; for (auto i = 0_uz; i < entity_count; i++) { std::uint64_t _id; _id << s; @@ -252,8 +251,8 @@ void reader_state::read_chunks(reader_t& s) proto.name = StringView{name.buf, name.len, StringViewFlag::Global|StringViewFlag::NullTerminated}; if (id & meta_long_scenery_bit) read_offsets(s, proto); - auto C = _world->make_entity<character>(oid, {ch, local}, proto); - c.add_entity_unsorted(C); + auto e = _world->make_entity<character>(oid, {ch, local}, proto); + (void)e; break; } case entity_type::scenery: { @@ -274,8 +273,8 @@ void reader_state::read_chunks(reader_t& s) if (sc.active) sc.delta << s; } - auto e = _world->make_entity<scenery>(oid, {ch, local}, sc); - c.add_entity_unsorted(e); + auto e = _world->make_entity<scenery, false>(oid, {ch, local}, sc); + (void)e; break; } default: diff --git a/serialize/world-writer.cpp b/serialize/world-writer.cpp index 9f724ef1..461f6dd6 100644 --- a/serialize/world-writer.cpp +++ b/serialize/world-writer.cpp @@ -335,11 +335,20 @@ void writer_state::serialize_chunk(const chunk& c, chunk_coords coord) check_atlas(wall_west); if (img_g != null_atlas) - s << img_g, s << ground.variant; + { + s << img_g; + s << ground.variant; + } if (img_n != null_atlas) - s << img_n, s << wall_north.variant; + { + s << img_n; + s << wall_north.variant; + } if (img_w != null_atlas) - s << img_w, s << wall_west.variant; + { + s << img_w; + s << wall_west.variant; + } } s << (std::uint32_t)c.entities().size(); |