Remove math mapgen

proller · proller · commit 7df83c2c6785 · 2014-07-12T18:15:55.000+04:00
diff --git a/builtin/mainmenu/dlg_create_world.lua b/builtin/mainmenu/dlg_create_world.lua
@@ -16,7 +16,7 @@
 --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 local function create_world_formspec(dialogdata)
-	local mapgens = {"v6", "v7", "indev", "singlenode", "math"}
+	local mapgens = {"v6", "v7", "indev", "singlenode"}
 
 	local current_seed = core.setting_get("fixed_map_seed") or ""
 	local current_mg   = core.setting_get("mg_name")
diff --git a/minetest.conf.example b/minetest.conf.example
@@ -441,9 +441,6 @@
 # Float islands starts from height, 0 to disable
 #mgindev_float_islands = 500
 
-# Math mapgen generator: sphere, mandelbox, mengersponge      dont forget to lower water_level = -30000
-#mgmath_generator = mandelbox
-
 # Enable/disable IPv6
 #enable_ipv6 = true
 # Enable/disable running an IPv6 server.  An IPv6 server may be restricted
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -359,7 +359,6 @@ set(common_SRCS
 	mapgen_v7.cpp
 	mapgen_indev.cpp
 	mapgen_singlenode.cpp
-	mapgen_math.cpp
 	treegen.cpp
 	dungeongen.cpp
 	cavegen.cpp
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
@@ -262,9 +262,6 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("chunksize", "5");
 	settings->setDefault("mg_flags", "");
 
-	settings->setDefault("mgmath_generator", "mandelbox");
-
-
 	// IPv6
 	settings->setDefault("enable_ipv6", "true");
 	settings->setDefault("ipv6_server", "false");
diff --git a/src/emerge.cpp b/src/emerge.cpp
@@ -44,7 +44,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapgen_v7.h"
 #include "mapgen_indev.h"
 #include "mapgen_singlenode.h"
-#include "mapgen_math.h"
 
 
 class EmergeThread : public JThread
@@ -86,7 +85,6 @@ EmergeManager::EmergeManager(IGameDef *gamedef) {
 	registerMapgen("v7",         new MapgenFactoryV7());
 	registerMapgen("indev",      new MapgenFactoryIndev());
 	registerMapgen("singlenode", new MapgenFactorySinglenode());
-	registerMapgen("math",       new MapgenFactoryMath());
 
 	this->ndef     = gamedef->getNodeDefManager();
 	this->biomedef = new BiomeDefManager();
diff --git a/src/mapgen_math.cpp b/src/mapgen_math.cpp
diff --git a/src/mapgen_math.h b/src/mapgen_math.h
