aboutsummaryrefslogtreecommitdiff
path: root/src/script
diff options
context:
space:
mode:
authorShadowNinja <shadowninja@minetest.net>2014-09-11 18:22:05 -0400
committerShadowNinja <shadowninja@minetest.net>2014-09-21 14:39:35 -0400
commit6bc4cad0eddd7a7cf593ca1471599e2d75727379 (patch)
treed05d5f039648d18f49fc0cf56132b2e9a5c88e09 /src/script
parent2ae5d3f3abc7ac5ee96c4dfc7eeead045fdc775e (diff)
downloadminetest-6bc4cad0eddd7a7cf593ca1471599e2d75727379.tar.gz
minetest-6bc4cad0eddd7a7cf593ca1471599e2d75727379.tar.bz2
minetest-6bc4cad0eddd7a7cf593ca1471599e2d75727379.zip
Split settings into seperate source and header files
This also cleans up settings a bit
Diffstat (limited to 'src/script')
-rw-r--r--src/script/lua_api/l_mapgen.cpp2
-rw-r--r--src/script/lua_api/l_util.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp
index c6d41050b..d31e84b3d 100644
--- a/src/script/lua_api/l_mapgen.cpp
+++ b/src/script/lua_api/l_mapgen.cpp
@@ -22,12 +22,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "lua_api/l_vmanip.h"
#include "common/c_converter.h"
#include "common/c_content.h"
+#include "util/serialize.h"
#include "server.h"
#include "environment.h"
#include "biome.h"
#include "emerge.h"
#include "mapgen_v7.h"
#include "main.h"
+#include "log.h"
struct EnumString ModApiMapgen::es_BiomeTerrainType[] =
diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp
index dda5b5abf..eb6c1835d 100644
--- a/src/script/lua_api/l_util.cpp
+++ b/src/script/lua_api/l_util.cpp
@@ -23,13 +23,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "common/c_content.h"
#include "cpp_api/s_async.h"
#include "serialization.h"
+#include "json/json.h"
#include "debug.h"
#include "porting.h"
#include "log.h"
#include "tool.h"
+#include "filesys.h"
#include "settings.h"
#include "main.h" //required for g_settings, g_settings_path
-#include "json/json.h"
// debug(...)
// Writes a line to dstream