Merge pull request #82629 from sparr/fix_map_extras_debug_no_verification

Author: Maleclypse

src/map_extras.cpp

@@ -1538,20 +1538,21 @@ void map_extra::load( const JsonObject &jo, std::string_view )
     }
 }
 
+void map_extra::finalize() const
+{
+    if( generator_method != map_extra_method::null ) {
+        MapExtras::all_function_names.push_back( id );
+    }
+}
+
 void map_extra::check() const
 {
     switch( generator_method ) {
         case map_extra_method::map_extra_function: {
             const map_extra_pointer mx_func = MapExtras::get_function( map_extra_id( generator_id ) );
             if( mx_func == nullptr ) {
                 debugmsg( "invalid map extra function (%s) defined for map extra (%s)", generator_id, id.str() );
-                break;
             }
-            MapExtras::all_function_names.push_back( id );
-            break;
-        }
-        case map_extra_method::mapgen: {
-            MapExtras::all_function_names.push_back( id );
             break;
         }
         case map_extra_method::update_mapgen: {
@@ -1560,11 +1561,10 @@ void map_extra::check() const
                 update_mapgen_func->second.funcs().empty() ) {
                 debugmsg( "invalid update mapgen function (%s) defined for map extra (%s)", generator_id,
                           id.str() );
-                break;
             }
-            MapExtras::all_function_names.push_back( id );
             break;
         }
+        case map_extra_method::mapgen:
         case map_extra_method::null:
         default:
             break;

src/map_extras.h

@@ -72,6 +72,7 @@ class map_extra
         bool was_loaded = false;
         void load( const JsonObject &jo, std::string_view src );
         static void finalize_all();
+        void finalize() const;
         void check() const;
     private:
         translation name_;