Split up mapgen.cpp

minetest · Nov 1, 2014 · 9e811a9 · 9e811a9
1 parent db25f75
commit 9e811a9
Show file tree

Hide file tree

Showing 20 changed files with 1,178 additions and 962 deletions.
diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk
@@ -102,7 +102,6 @@ LOCAL_C_INCLUDES :=                               \
 LOCAL_SRC_FILES :=                                \
 		jni/src/ban.cpp                           \
 		jni/src/base64.cpp                        \
-		jni/src/biome.cpp                         \
 		jni/src/camera.cpp                        \
 		jni/src/cavegen.cpp                       \
 		jni/src/chat.cpp                          \
@@ -165,6 +164,10 @@ LOCAL_SRC_FILES :=                                \
 		jni/src/mapnode.cpp                       \
 		jni/src/mapsector.cpp                     \
 		jni/src/mesh.cpp                          \
+		jni/src/mg_biome.cpp                      \
+		jni/src/mg_decoration.cpp                 \
+		jni/src/mg_ore.cpp                        \
+		jni/src/mg_schematic.cpp                  \
 		jni/src/mods.cpp                          \
 		jni/src/nameidmapping.cpp                 \
 		jni/src/nodedef.cpp                       \

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -335,7 +335,6 @@ add_subdirectory(util)
 set(common_SRCS
 	ban.cpp
 	base64.cpp
-	biome.cpp
 	cavegen.cpp
 	clientiface.cpp
 	collision.cpp
@@ -373,6 +372,10 @@ set(common_SRCS
 	mapgen_v7.cpp
 	mapnode.cpp
 	mapsector.cpp
+	mg_biome.cpp
+	mg_decoration.cpp
+	mg_ore.cpp
+	mg_schematic.cpp
 	mods.cpp
 	nameidmapping.cpp
 	nodedef.cpp

diff --git a/src/emerge.cpp b/src/emerge.cpp
@@ -39,7 +39,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "profiler.h"
 #include "log.h"
 #include "nodedef.h"
-#include "biome.h"
+#include "mg_biome.h"
 #include "mapgen_v6.h"
 #include "mapgen_v7.h"
 #include "mapgen_singlenode.h"

diff --git a/src/emerge.h b/src/emerge.h
@@ -38,8 +38,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	infostream << "EmergeThread: " x << std::endl; }
 
 class EmergeThread;
-//class Mapgen;
-//struct MapgenFactory;
 class Biome;
 class BiomeDefManager;
 class Decoration;

diff --git a/src/map.cpp b/src/map.cpp
@@ -37,7 +37,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "environment.h"
 #include "emerge.h"
 #include "mapgen_v6.h"
-#include "biome.h"
+#include "mg_biome.h"
 #include "config.h"
 #include "server.h"
 #include "database.h"