instantiate scenery in a uniform manner

Now using world::make_scenery().

Add `std::monostate` to the `scenery_proto` variant to catch potential
bugs.

1 files changed, 1 insertions, 17 deletions

diff --git a/editor/scenery-editor.cpp b/editor/scenery-editor.cpp
index 28d94263..55e194bf 100644
--- a/editor/scenery-editor.cpp
+++ b/editor/scenery-editor.cpp
@@ -103,25 +103,9 @@ start:
     }
     else
     {
-        const auto sc_type = s.proto.scenery_type();
         // todo check collision at pos
-        switch (sc_type)
-        {
-        case scenery_type::none:
-        case scenery_type::COUNT:
-            break;
-        case scenery_type::generic:
-            w.make_object<generic_scenery>(w.make_id(), pos, std::get<generic_scenery_proto>(s.proto.subtype), s.proto);
-            goto ok;
-        case scenery_type::door:
-            w.make_object<door_scenery>(w.make_id(), pos, std::get<door_scenery_proto>(s.proto.subtype), s.proto);
-            goto ok;
-        }
-        fm_abort("place_tile: wrong scenery type %d", (int)sc_type);
-ok:
-        void();
+        w.make_scenery(w.make_id(), pos, scenery_proto(s.proto));
     }
-
 }
 
 } // namespace floormat