Fix core.download_file() creating empty files on HTTP error

[dragonfireclient.git] / builtin / game / init.lua

diff --git a/builtin/game/init.lua b/builtin/game/init.lua
index 6b3f9be3f75e037e57fb64220a8fa84ca8b68734..ab1503dee411436c9105fb4edec16431844c9300 100644 (file)
--- a/builtin/game/init.lua
+++ b/builtin/game/init.lua
@@ -1,29 +1,36 @@
 
-local scriptpath = minetest.get_builtin_path()..DIR_DELIM
+local scriptpath = core.get_builtin_path()
 local commonpath = scriptpath.."common"..DIR_DELIM
 local gamepath = scriptpath.."game"..DIR_DELIM
 
+-- Shared between builtin files, but
+-- not exposed to outer context
+local builtin_shared = {}
+
 dofile(commonpath.."vector.lua")
 
-dofile(gamepath.."item.lua")
+dofile(gamepath.."constants.lua")
+assert(loadfile(gamepath.."item.lua"))(builtin_shared)
 dofile(gamepath.."register.lua")
 
-if core.setting_getbool("mod_profiling") then
-       dofile(gamepath.."mod_profiling.lua")
+if core.settings:get_bool("profiler.load") then
+       profiler = dofile(scriptpath.."profiler"..DIR_DELIM.."init.lua")
 end
 
+dofile(commonpath .. "after.lua")
 dofile(gamepath.."item_entity.lua")
 dofile(gamepath.."deprecated.lua")
 dofile(gamepath.."misc.lua")
 dofile(gamepath.."privileges.lua")
 dofile(gamepath.."auth.lua")
+dofile(commonpath .. "chatcommands.lua")
 dofile(gamepath.."chatcommands.lua")
 dofile(gamepath.."static_spawn.lua")
 dofile(gamepath.."detached_inventory.lua")
-dofile(gamepath.."falling.lua")
+assert(loadfile(gamepath.."falling.lua"))(builtin_shared)
 dofile(gamepath.."features.lua")
 dofile(gamepath.."voxelarea.lua")
 dofile(gamepath.."forceloading.lua")
 dofile(gamepath.."statbars.lua")
-dofile(gamepath.."builtin_biome.lua")
 
+profiler = nil