Merge pull request #40381 from BevapDin/bbm

Reset loaded monster adjustments.
CleverRaven · May 9, 2020 · e35d300 · e35d300
2 parents 4aa0d6d + be268f8
commit e35d300
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
@@ -516,6 +516,7 @@ void DynamicDataLoader::unload_data()
     overmap_terrains::reset();
     profession::reset();
     quality::reset();
+    reset_monster_adjustment();
     recipe_dictionary::reset();
     recipe_group::reset();
     requirement_data::reset();

diff --git a/src/monstergenerator.cpp b/src/monstergenerator.cpp
@@ -308,6 +308,11 @@ void monster_adjustment::apply( mtype &mon )
 
 static std::vector<monster_adjustment> adjustments;
 
+void reset_monster_adjustment()
+{
+    adjustments.clear();
+}
+
 void load_monster_adjustment( const JsonObject &jsobj )
 {
     monster_adjustment adj;

diff --git a/src/monstergenerator.h b/src/monstergenerator.h
@@ -112,5 +112,6 @@ class MonsterGenerator
 };
 
 void load_monster_adjustment( const JsonObject &jsobj );
+void reset_monster_adjustment();
 
 #endif // CATA_SRC_MONSTERGENERATOR_H