Merge pull request #82535 from ehughsbaird/generic-finalize

Call T::finalize from generic_factory<T>::finalize

Author: GuardianDll

data/mods/Xedra_Evolved/scenario.json

@@ -103,7 +103,7 @@
     "flags": [ "LONE_START" ]
   },
   {
-    "copy-from": "mine_bottom",
+    "copy-from": "Mine_bottom",
     "type": "scenario",
     "extend": { "professions": [ "archaeologist" ] },
     "id": "Mine_bottom"

src/achievement.cpp

@@ -404,13 +404,16 @@ void achievement::load_achievement( const JsonObject &jo, const std::string &src
 
 void achievement::finalize()
 {
-    for( achievement &a : const_cast<std::vector<achievement>&>( achievement::get_all() ) ) {
-        for( achievement_requirement &req : a.requirements_ ) {
-            req.finalize();
-        }
+    for( achievement_requirement &req : requirements_ ) {
+        req.finalize();
     }
 }
 
+void achievement::finalize_all()
+{
+    achievement_factory.finalize();
+}
+
 void achievement::check_consistency()
 {
     achievement_factory.check();

src/achievement.h

@@ -59,9 +59,10 @@ class achievement
         achievement() = default;
 
         void load( const JsonObject &, std::string_view );
+        void finalize();
         void check() const;
         static void load_achievement( const JsonObject &, const std::string & );
-        static void finalize();
+        static void finalize_all();
         static void check_consistency();
         static const std::vector<achievement> &get_all();
         static void reset();

src/addiction.cpp

@@ -57,6 +57,11 @@ void add_type::load_add_types( const JsonObject &jo, const std::string &src )
     add_type_factory.load( jo, src );
 }
 
+void add_type::finalize_all()
+{
+    add_type_factory.finalize();
+}
+
 void add_type::reset()
 {
     add_type_factory.reset();

src/addiction.h

@@ -28,6 +28,7 @@ struct add_type {
         static void load_add_types( const JsonObject &jo, const std::string &src );
         static void reset();
         static void check_add_types();
+        static void finalize_all();
         void load( const JsonObject &jo, std::string_view src );
         static const std::vector<add_type> &get_all();
 

src/ammo_effect.cpp

@@ -162,9 +162,6 @@ void ammo_effects::load( const JsonObject &jo, const std::string &src )
 void ammo_effects::finalize_all()
 {
     get_all_ammo_effects().finalize();
-    for( const ammo_effect &ae : get_all_ammo_effects().get_all() ) {
-        const_cast<ammo_effect &>( ae ).finalize();
-    }
 }
 
 void ammo_effects::check_consistency()

src/anatomy.cpp

@@ -64,11 +64,7 @@ void anatomy::reset()
 
 void anatomy::finalize_all()
 {
-    // For some weird reason, generic_factory::finalize doesn't call finalize
     anatomy_factory.finalize();
-    for( const anatomy &an : anatomy_factory.get_all() ) {
-        const_cast<anatomy &>( an ).finalize();
-    }
 }
 
 void anatomy::finalize()

src/ascii_art.cpp

@@ -31,6 +31,11 @@ void ascii_art::load_ascii_art( const JsonObject &jo, const std::string &src )
     ascii_art_factory.load( jo, src );
 }
 
+void ascii_art::finalize_all()
+{
+    ascii_art_factory.finalize();
+}
+
 void ascii_art::load( const JsonObject &jo, std::string_view )
 {
     mandatory( jo, was_loaded, "picture", picture );

src/ascii_art.h

@@ -15,6 +15,7 @@ class ascii_art
 {
     public:
         static void load_ascii_art( const JsonObject &jo, const std::string &src );
+        static void finalize_all();
         static void reset();
 
         void load( const JsonObject &jo, std::string_view );

src/behavior.cpp

@@ -193,6 +193,7 @@ void behavior::reset()
 
 void behavior::finalize()
 {
+    behavior_factory.finalize();
     for( const node_data &new_node : temp_node_data ) {
         for( const std::string &child : new_node.children ) {
             const_cast<node_t &>( new_node.id.obj() ).