diff options
Diffstat (limited to 'serialize')
| -rw-r--r-- | serialize/world-reader.cpp | 3 | ||||
| -rw-r--r-- | serialize/world-writer.cpp | 14 |
2 files changed, 12 insertions, 5 deletions
diff --git a/serialize/world-reader.cpp b/serialize/world-reader.cpp index ec8b733a..d3954b09 100644 --- a/serialize/world-reader.cpp +++ b/serialize/world-reader.cpp @@ -223,10 +223,13 @@ void reader_state::read_chunks(reader_t& s) //t.passability() = pass_mode(flags & pass_mask); if (flags & meta_ground) t.ground() = make_atlas(); + // todo! +#if 0 if (flags & meta_wall_n) t.wall_north() = make_atlas(); if (flags & meta_wall_w) t.wall_west() = make_atlas(); +#endif if (PROTO >= 3 && PROTO < 8) [[unlikely]] if (flags & meta_scenery_) read_old_scenery(s, ch, i); diff --git a/serialize/world-writer.cpp b/serialize/world-writer.cpp index c41fa89d..90fcf3b4 100644 --- a/serialize/world-writer.cpp +++ b/serialize/world-writer.cpp @@ -458,14 +458,17 @@ void writer_state::serialize_chunk(const chunk& c, chunk_coords_ coord) for (auto i = 0uz; i < TILE_COUNT; i++) { const tile_proto x = c[i]; - const auto ground = x.ground(), wall_north = x.wall_north(), wall_west = x.wall_west(); + const auto ground = x.ground(); + const auto wall_north = x.wall_north(), wall_west = x.wall_west(); //const auto scenery = x.scenery_frame; fm_debug_assert(s.bytes_written() + tile_size <= chunkbuf_size); auto img_g = maybe_intern_atlas(ground); - auto img_n = maybe_intern_atlas(wall_north); - auto img_w = maybe_intern_atlas(wall_west); + //auto img_n = maybe_intern_atlas(wall_north); + //auto img_w = maybe_intern_atlas(wall_west); + // todo! + auto img_n = null_atlas, img_w = null_atlas; if (img_g == null_atlas && img_n == null_atlas && img_w == null_atlas) { @@ -495,8 +498,9 @@ void writer_state::serialize_chunk(const chunk& c, chunk_coords_ coord) fm_assert(!x.atlas || x.variant < x.atlas->num_tiles()); }; check_atlas(ground); - check_atlas(wall_north); - check_atlas(wall_west); + // todo! + //check_atlas(wall_north); + //check_atlas(wall_west); if (img_g != null_atlas) { |