Add callback parameter for core.emerge_area()

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

diff --git a/builtin/game/init.lua b/builtin/game/init.lua
index b878a2664164bc55418fb26a85f0833208b284f6..a6cfa3bf88cda6fc16bd62f6aac1533b1eae4fba 100644 (file)
--- a/builtin/game/init.lua
+++ b/builtin/game/init.lua
@@ -1,12 +1,18 @@
 
-local scriptpath = minetest.get_builtin_path()..DIR_DELIM
+local scriptpath = core.get_builtin_path()..DIR_DELIM
 local commonpath = scriptpath.."common"..DIR_DELIM
 local gamepath = scriptpath.."game"..DIR_DELIM
 
 dofile(commonpath.."vector.lua")
 
+dofile(gamepath.."constants.lua")
 dofile(gamepath.."item.lua")
 dofile(gamepath.."register.lua")
+
+if core.setting_getbool("mod_profiling") then
+       dofile(gamepath.."mod_profiling.lua")
+end
+
 dofile(gamepath.."item_entity.lua")
 dofile(gamepath.."deprecated.lua")
 dofile(gamepath.."misc.lua")
@@ -20,4 +26,3 @@ dofile(gamepath.."features.lua")
 dofile(gamepath.."voxelarea.lua")
 dofile(gamepath.."forceloading.lua")
 dofile(gamepath.."statbars.lua")
-