Merge pull request #37425 from BevapDin/lib

Check loaded mapgen for being used at all.
CleverRaven · Mar 9, 2020 · 2cdcd88 · 2cdcd88
2 parents 6e83cb4 + e2b0dd8
commit 2cdcd88
Show file tree

Hide file tree

Showing 4 changed files with 267 additions and 250 deletions.
diff --git a/src/map_extras.cpp b/src/map_extras.cpp
@@ -2832,9 +2832,6 @@ void map_extra::load( const JsonObject &jo, const std::string & )
     optional( jo, was_loaded, "autonote", autonote, false );
 }
 
-extern std::map<std::string, std::vector<std::shared_ptr<mapgen_function>> > oter_mapgen;
-extern std::map<std::string, std::vector<std::unique_ptr<mapgen_function_json_nested>> >
-        nested_mapgen;
 extern std::map<std::string, std::vector<std::unique_ptr<update_mapgen_function_json>> >
         update_mapgen;
 
@@ -2850,13 +2847,6 @@ void map_extra::check() const
             break;
         }
         case map_extra_method::mapgen: {
-            /*
-            const auto fmapit = oter_mapgen.find( generator_id );
-            const oter_id extra_oter( generator_id );
-            if( ( fmapit == oter_mapgen.end() || !fmapit->second.empty() ) && !extra_oter.is_valid() ) {
-                debugmsg( "invalid mapgen function (%s) defined for map extra (%s)", generator_id, id.str() );
-            }
-            */
             break;
         }
         case map_extra_method::update_mapgen: {