Revise dynamic_add_media API to better accomodate future changes

[dragonfireclient.git] / builtin / init.lua

diff --git a/builtin/init.lua b/builtin/init.lua
index b34ad14a0d647ca78c7456b0d2dfee4a928e52c4..75bb3db8507cbf2bf26f929ac8ad947660c50e39 100644 (file)
--- a/builtin/init.lua
+++ b/builtin/init.lua
@@ -21,12 +21,12 @@ if core.print then
        core.print = nil -- don't pollute our namespace
 end
 math.randomseed(os.time())
-os.setlocale("C", "numeric")
 minetest = core
 
 -- Load other files
-local scriptdir = core.get_builtin_path() .. DIR_DELIM
+local scriptdir = core.get_builtin_path()
 local gamepath = scriptdir .. "game" .. DIR_DELIM
+local clientpath = scriptdir .. "client" .. DIR_DELIM
 local commonpath = scriptdir .. "common" .. DIR_DELIM
 local asyncpath = scriptdir .. "async" .. DIR_DELIM
 
@@ -36,8 +36,9 @@ dofile(commonpath .. "misc_helpers.lua")
 
 if INIT == "game" then
        dofile(gamepath .. "init.lua")
+       assert(not core.get_http_api)
 elseif INIT == "mainmenu" then
-       local mm_script = core.setting_get("main_menu_script")
+       local mm_script = core.settings:get("main_menu_script")
        if mm_script and mm_script ~= "" then
                dofile(mm_script)
        else
@@ -45,6 +46,8 @@ elseif INIT == "mainmenu" then
        end
 elseif INIT == "async" then
        dofile(asyncpath .. "init.lua")
+elseif INIT == "client" then
+       dofile(clientpath .. "init.lua")
 else
        error(("Unrecognized builtin initialization type %s!"):format(tostring(INIT)))
 end