CSM: Revert "[CSM] Add send_chat_message and run_server_chatcommand"

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

diff --git a/builtin/init.lua b/builtin/init.lua
index 4400a19d61b1ca5a0a2c6a806e63250d18468095..e94f3213a41fe679dc50c8a3deaa9482d1349106 100644 (file)
--- a/builtin/init.lua
+++ b/builtin/init.lua
@@ -25,8 +25,9 @@ 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
 
@@ -37,15 +38,17 @@ dofile(commonpath .. "misc_helpers.lua")
 if INIT == "game" then
        dofile(gamepath .. "init.lua")
 elseif INIT == "mainmenu" then
-       local mainmenuscript = core.setting_get("main_menu_script")
-       if mainmenuscript ~= nil and mainmenuscript ~= "" then
-               dofile(mainmenuscript)
+       local mm_script = core.settings:get("main_menu_script")
+       if mm_script and mm_script ~= "" then
+               dofile(mm_script)
        else
                dofile(core.get_mainmenu_path() .. DIR_DELIM .. "init.lua")
        end
 elseif INIT == "async" then
        dofile(asyncpath .. "init.lua")
+elseif INIT == "client" then
+       os.setlocale = nil
+       dofile(clientpath .. "init.lua")
 else
        error(("Unrecognized builtin initialization type %s!"):format(tostring(INIT)))
 end
-