CSM: Disallow exploitable clientside mod functions by default (#7547)

[dragonfireclient.git] / builtin / init.lua

diff --git a/builtin/init.lua b/builtin/init.lua
index 6b27cf76e16d99694165da80d2a3eddb4f4c68ff..f76174be7d5c727fe85b5b20a9a83a584e39646d 100644 (file)
--- a/builtin/init.lua
+++ b/builtin/init.lua
@@ -12,7 +12,7 @@ if core.print then
        -- Override native print and use
        -- terminal if that's turned on
        function print(...)
-               local n, t = select("#", ...), { ... }
+               local n, t = select("#", ...), {...}
                for i = 1, n do
                        t[i] = tostring(t[i])
                end
@@ -21,31 +21,32 @@ 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 gamepath = scriptdir.."game"..DIR_DELIM
-local commonpath = scriptdir.."common"..DIR_DELIM
-local asyncpath = scriptdir.."async"..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
 
-dofile(commonpath.."strict.lua")
-dofile(commonpath.."serialize.lua")
-dofile(commonpath.."misc_helpers.lua")
+dofile(commonpath .. "strict.lua")
+dofile(commonpath .. "serialize.lua")
+dofile(commonpath .. "misc_helpers.lua")
 
 if INIT == "game" then
-       dofile(gamepath.."init.lua")
+       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")
+               dofile(core.get_mainmenu_path() .. DIR_DELIM .. "init.lua")
        end
 elseif INIT == "async" then
-       dofile(asyncpath.."init.lua")
+       dofile(asyncpath .. "init.lua")
+elseif INIT == "client" then
+       dofile(clientpath .. "init.lua")
 else
        error(("Unrecognized builtin initialization type %s!"):format(tostring(INIT)))
 end
-