Permalink
1 comment
on commit
sign in to comment.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
with
111 additions
and 47 deletions.
- +26 −1 builtin/game/{chatcommands.lua → chat.lua}
- +20 −20 builtin/game/init.lua
- +4 −0 builtin/settingtypes.txt
- +6 −0 doc/lua_api.txt
- +5 −0 minetest.conf.example
- +1 −0 src/defaultsettings.cpp
- +0 −1 src/gettime.h
- +22 −0 src/script/cpp_api/s_server.cpp
- +8 −4 src/script/cpp_api/s_server.h
- +19 −21 src/server.cpp
@@ -1,37 +1,37 @@ | ||
|
||
local scriptpath = core.get_builtin_path() | ||
local commonpath = scriptpath.."common"..DIR_DELIM | ||
local gamepath = scriptpath.."game"..DIR_DELIM | ||
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(commonpath .. "vector.lua") | ||
|
||
dofile(gamepath.."constants.lua") | ||
assert(loadfile(gamepath.."item.lua"))(builtin_shared) | ||
dofile(gamepath.."register.lua") | ||
dofile(gamepath .. "constants.lua") | ||
assert(loadfile(gamepath .. "item.lua"))(builtin_shared) | ||
dofile(gamepath .. "register.lua") | ||
|
||
if core.settings:get_bool("profiler.load") then | ||
profiler = dofile(scriptpath.."profiler"..DIR_DELIM.."init.lua") | ||
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(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 .. "chat.lua") | ||
dofile(commonpath .. "information_formspecs.lua") | ||
dofile(gamepath.."static_spawn.lua") | ||
dofile(gamepath.."detached_inventory.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 .. "static_spawn.lua") | ||
dofile(gamepath .. "detached_inventory.lua") | ||
assert(loadfile(gamepath .. "falling.lua"))(builtin_shared) | ||
dofile(gamepath .. "features.lua") | ||
dofile(gamepath .. "voxelarea.lua") | ||
dofile(gamepath .. "forceloading.lua") | ||
dofile(gamepath .. "statbars.lua") | ||
|
||
profiler = nil |
This comment has been minimized.
d1c27c7
cool!