From 2260ab972100f1d6679690b730b6f0aa7409b014 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sat, 13 Apr 2024 17:42:30 +0200
Subject: instantiate scenery in a uniform manner

Now using world::make_scenery().

Add `std::monostate` to the `scenery_proto` variant to catch potential
bugs.
---
 serialize/old-savegame.cpp | 30 ++++--------------------------
 serialize/savegame.cpp     | 11 +++++------
 serialize/scenery.cpp      |  1 +
 3 files changed, 10 insertions(+), 32 deletions(-)

(limited to 'serialize')

diff --git a/serialize/old-savegame.cpp b/serialize/old-savegame.cpp
index 31136798..fe56be32 100644
--- a/serialize/old-savegame.cpp
+++ b/serialize/old-savegame.cpp
@@ -183,6 +183,8 @@ bool read_object_flags(binary_reader<T>& s, U& e)
             val->closing     = !!(flags & 1 << 3);
             val->interactive = !!(flags & 1 << 4);
         }
+        else
+            fm_soft_assert(false);
     }
     else if constexpr(tag == object_type::critter)
     {
@@ -475,26 +477,7 @@ void reader_state::read_chunks(reader_t& s)
                         s >> sc.offset[1];
                     }
                     read_bbox(s, sc);
-                    if (const auto* val = std::get_if<generic_scenery_proto>(&sc.subtype))
-                    {
-                        if (val->active)
-                        {
-                            uint16_t delta_; delta_ << s;
-                            sc.delta = uint32_t(sc.delta) * 65536u;
-                        }
-                        _world->make_object<generic_scenery, false>(oid, {ch, local}, *val, sc);
-                    }
-                    else if (const auto* val = std::get_if<door_scenery_proto>(&sc.subtype))
-                    {
-                        if (val->active)
-                        {
-                            uint16_t delta_; delta_ << s;
-                            sc.delta = uint32_t(sc.delta) * 65536u;
-                        }
-                        _world->make_object<door_scenery, false>(oid, {ch, local}, *val, sc);
-                    }
-                    else
-                        fm_soft_assert(false);
+                    _world->make_scenery(oid, {ch, local}, move(sc));
                 }
                 break;
             }
@@ -635,12 +618,7 @@ void reader_state::read_old_scenery(reader_t& s, chunk_coords_ ch, size_t i)
     }
     else
     {
-        if (auto* val = std::get_if<generic_scenery_proto>(&sc.subtype))
-            auto e = _world->make_object<generic_scenery, false>(_world->make_id(), coord, *val, sc);
-        else if (auto* val = std::get_if<door_scenery_proto>(&sc.subtype))
-            auto e = _world->make_object<door_scenery, false>(_world->make_id(), coord, *val, sc);
-        else
-            fm_soft_assert(false);
+        _world->make_scenery(_world->make_id(), coord, move(sc));
     }
 }
 
diff --git a/serialize/savegame.cpp b/serialize/savegame.cpp
index 4bc1c7ad..04f9c599 100644
--- a/serialize/savegame.cpp
+++ b/serialize/savegame.cpp
@@ -837,20 +837,19 @@ struct reader final : visitor_<reader, false>
         case scenery_type::generic: {
             generic_scenery_proto p;
             visit_scenery_proto(p, f);
-            sc.subtype = move(p); // todo! extract into make_scenery()
-            ret = w.make_object<generic_scenery>(h.id, coord, move(p), move(sc));
-            return;
+            sc.subtype = move(p);
+            goto ok;
         }
         case scenery_type::door: {
             door_scenery_proto p;
             visit_scenery_proto(p, f);
             sc.subtype = move(p);
-            ret = w.make_object<door_scenery>(h.id, coord, move(p), move(sc));
-            return;
+            goto ok;
         }
         }
-
         fm_throw("invalid sc_type {}"_cf, (int)sc_type);
+ok:
+        ret = w.make_scenery(h.id, coord, move(sc));
     }
 
     template<typename Obj, typename Proto, typename Header>
diff --git a/serialize/scenery.cpp b/serialize/scenery.cpp
index 5950ddf3..edcd57c7 100644
--- a/serialize/scenery.cpp
+++ b/serialize/scenery.cpp
@@ -104,6 +104,7 @@ void adl_serializer<scenery_proto>::to_json(json& j, const scenery_proto& f)
     if (f.pass != default_scenery.pass)
         j["pass-mode"] = f.pass;
     std::visit(overloaded {
+        [](std::monostate) { fm_soft_assert(false); },
         [&](const generic_scenery_proto& x) {
           if (x.active != default_generic_scenery.active)
               j["active"] = x.active;
-- 
cgit v1.2.3