Remove no virtual dtor warnings, make MapgenParams contain actual NoiseParams

[minetest.git] / src / emerge.cpp

diff --git a/src/emerge.cpp b/src/emerge.cpp
index 9d3f94d48428f5d9a97a86af268b7c0783d5592c..2d8b01819b08916877ddbd9b1674c557331d49ce 100644 (file)
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -50,7 +50,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 EmergeManager::EmergeManager(IGameDef *gamedef) {
        //register built-in mapgens
        registerMapgen("v6", new MapgenFactoryV6());
-       //registerMapgen("v7", new MapgenFactoryV7());
+       registerMapgen("v7", new MapgenFactoryV7());
        registerMapgen("indev", new MapgenFactoryIndev());
        registerMapgen("singlenode", new MapgenFactorySinglenode());
 
@@ -97,9 +97,6 @@ EmergeManager::~EmergeManager() {
                delete mapgen[i];
        }
        emergethread.clear();
-
-       for (unsigned int i = 0; i < mapgen.size(); i++)
-               delete mapgen[i];
        mapgen.clear();
 
        for (unsigned int i = 0; i < ores.size(); i++)