Merge pull request #37914 from anothersimulacrum/scen-bl

Clear loaded scenario blacklist when leaving world
CleverRaven · Feb 11, 2020 · 922fcd2 · 922fcd2
2 parents 7572e38 + 9f4e399
commit 922fcd2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -512,6 +512,7 @@ void DynamicDataLoader::unload_data()
     reset_mapgens();
     reset_effect_types();
     reset_speech();
+    reset_scenarios_blacklist();
     overmap_land_use_codes::reset();
     overmap_connections::reset();
     overmap_locations::reset();

diff --git a/src/scenario.cpp b/src/scenario.cpp
@@ -257,12 +257,12 @@ void scen_blacklist::load( const JsonObject &jo, const std::string & )
 
 void scen_blacklist::finalize()
 {
-    std::vector<string_id<scenario>> all_scenarios;
+    std::vector<string_id<scenario>> all_scens;
     for( const scenario &scen : scenario::get_all() ) {
-        all_scenarios.emplace_back( scen.ident() );
+        all_scens.emplace_back( scen.ident() );
     }
     for( const string_id<scenario> &sc : sc_blacklist.scenarios ) {
-        if( std::find( all_scenarios.begin(), all_scenarios.end(), sc ) == all_scenarios.end() ) {
+        if( std::find( all_scens.begin(), all_scens.end(), sc ) == all_scens.end() ) {
             debugmsg( "Scenario blacklist contains invalid scenario" );
         }
     }
@@ -283,6 +283,11 @@ void scen_blacklist::finalize()
     }
 }
 
+void reset_scenarios_blacklist()
+{
+    sc_blacklist.scenarios.clear();
+}
+
 std::vector<string_id<profession>> scenario::permitted_professions() const
 {
     if( !cached_permitted_professions.empty() ) {

diff --git a/src/scenario.h b/src/scenario.h
@@ -119,4 +119,6 @@ struct scen_blacklist {
     void finalize();
 };
 
+void reset_scenarios_blacklist();
+
 #endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -119,4 +119,6 @@ struct scen_blacklist { @@
         void finalize();
     };
+    void reset_scenarios_blacklist();
     #endif