X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=builtin%2Finit.lua;h=f76174be7d5c727fe85b5b20a9a83a584e39646d;hb=ec3224dce26fac8361f457514d4376d9753ee36b;hp=6fc1bf6d5732ecec60819b0a87b6f01122ba5a79;hpb=9ffa88b558498a139488679ef2ed8767c8540471;p=minetest.git

diff --git a/builtin/init.lua b/builtin/init.lua
index 6fc1bf6d5..f76174be7 100644
--- a/builtin/init.lua
+++ b/builtin/init.lua
@@ -6,32 +6,47 @@
 --
 
 -- Initialize some very basic things
-print = core.debug
+function core.debug(...) core.log(table.concat({...}, "\t")) end
+if core.print then
+	local core_print = core.print
+	-- Override native print and use
+	-- terminal if that's turned on
+	function print(...)
+		local n, t = select("#", ...), {...}
+		for i = 1, n do
+			t[i] = tostring(t[i])
+		end
+		core_print(table.concat(t, "\t"))
+	end
+	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.."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
-