Merge pull request #38545 from Fris0uman/reset_scent

Reset scent types on game load
CleverRaven · Mar 4, 2020 · 5723071 · 5723071
2 parents 4859a3d + c8833cc
commit 5723071
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -537,6 +537,7 @@ void DynamicDataLoader::unload_data()
     event_transformation::reset();
     event_statistic::reset();
     score::reset();
+    scent_type::reset();
 
     // TODO:
     //    Name::clear();

diff --git a/src/scent_map.cpp b/src/scent_map.cpp
@@ -290,3 +290,8 @@ void scent_type::check_scent_consistency()
         }
     }
 }
+
+void scent_type::reset()
+{
+    scent_factory.reset();
+}
diff --git a/src/scent_map.h b/src/scent_map.h
@@ -33,6 +33,7 @@ class scent_type
 
         scenttype_id id;
         std::set<species_id> receptive_species;
+        static void reset();
 };
 
 class scent_map
-Original file line number
+Diff line change
@@ Expand Up / @@ -290,3 +290,8 @@ void scent_type::check_scent_consistency() @@
             }
         }
     }
+    void scent_type::reset()
+    {
+        scent_factory.reset();
+    }