1 files changed, 21 insertions, 12 deletions

diff --git a/test/serializer.cpp b/test/serializer.cpp
index 71b1a3f1..c74f4ddf 100644
--- a/test/serializer.cpp
+++ b/test/serializer.cpp
@@ -9,40 +9,50 @@ namespace floormat {
 
 namespace Path = Corrade::Utility::Path;
 
-chunk test_app::make_test_chunk()
+chunk& test_app::make_test_chunk(chunk_coords ch)
 {
+    chunk& c = w[ch];
+    c.mark_modified();
     auto metal1 = loader.tile_atlas("metal1", {2, 2}, pass_mode::pass),
          metal2 = loader.tile_atlas("metal2", {2, 2}, pass_mode::blocked),
          tiles  = loader.tile_atlas("tiles", {8, 5}, pass_mode::pass);
     constexpr auto N = TILE_MAX_DIM;
-    chunk c;
     for (auto [x, k, pt] : c)
         x.ground() = { tiles, variant_t(k % tiles->num_tiles()) };
     auto door = loader.scenery("door1"),
          table = loader.scenery("table1"),
          control_panel = loader.scenery("control panel (wall) 1");
-    control_panel.frame.r = rotation::W;
+    control_panel.r = rotation::W;
     constexpr auto K = N/2;
     c[{K,   K  }].wall_north() = { metal1, 0 };
     c[{K,   K  }].wall_west()  = { metal2, 0 };
     c[{K,   K+1}].wall_north() = { metal1, 0 };
     c[{K+1, K  }].wall_west()  = { metal2, 0 };
-    c[{K+3, K+1}].scenery() = door;
-    c[{ 3,   4 }].scenery() = table;
-    c[{K,   K+1}].scenery() = control_panel;
-    c[{K,   K+1}].scenery().frame.bbox_size = {99, 88};
-    c.mark_modified();
+    w.make_entity<scenery>({ch, {K+3, K+1}}, door);
+    w.make_entity<scenery>({ch, {3, 4}}, table);
+    w.make_entity<scenery>({ch, {K, K+1}}, control_panel);
     return c;
 }
 
 static bool chunks_equal(const chunk& a, const chunk& b)
 {
+    if (a.entities().size() != b.entities().size())
+        return false;
+
     for (auto i = 0_uz; i < TILE_COUNT; i++)
     {
         const auto &a1 = a[i], &b1 = b[i];
         if (a1 != b1)
             return false;
     }
+
+    for (auto i = 0_uz; i < a.entities().size(); i++)
+    {
+        auto &ae = *a.entities()[i], &be = *b.entities()[i];
+        if (entity_proto(ae) != entity_proto(be))
+            return false;
+    }
+
     return true;
 }
 
@@ -51,13 +61,12 @@ void test_app::test_serializer()
     constexpr auto filename = "../test/test-serializer1.dat";
     if (Path::exists(filename))
         Path::remove(filename);
-    world w;
     const chunk_coords coord{1, 1};
-    w[coord] = make_test_chunk();
+    auto& c = make_test_chunk(coord);
     w.serialize(filename);
     auto w2 = world::deserialize(filename);
-    auto &c1 = w[coord], &c2 = w2[coord];
-    fm_assert(chunks_equal(c1, c2));
+    auto& c2 = w2[coord];
+    fm_assert(chunks_equal(c, c2));
 }
 
 } // namespace floormat