X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=builtin%2Finit.lua;h=7a9b5c42718002d7cc75b6d31712ce7b5b2bc1a2;hb=1d07a365528e3b947a03baba9ef986af2ecd23d1;hp=4400a19d61b1ca5a0a2c6a806e63250d18468095;hpb=92d4a738435c4b8d5944375c596befcc15b3f47c;p=dragonfireclient.git

diff --git a/builtin/init.lua b/builtin/init.lua
index 4400a19d6..7a9b5c427 100644
--- a/builtin/init.lua
+++ b/builtin/init.lua
@@ -21,31 +21,45 @@ 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
 
+dofile(commonpath .. "vector.lua")
 dofile(commonpath .. "strict.lua")
 dofile(commonpath .. "serialize.lua")
 dofile(commonpath .. "misc_helpers.lua")
 
 if INIT == "game" then
 	dofile(gamepath .. "init.lua")
+	assert(not core.get_http_api)
 elseif INIT == "mainmenu" then
-	local mainmenuscript = core.setting_get("main_menu_script")
-	if mainmenuscript ~= nil and mainmenuscript ~= "" then
-		dofile(mainmenuscript)
-	else
+	local mm_script = core.settings:get("main_menu_script")
+	local custom_loaded = false
+	if mm_script and mm_script ~= "" then
+		local testfile = io.open(mm_script, "r")
+		if testfile then
+			testfile:close()
+			dofile(mm_script)
+			custom_loaded = true
+			core.log("info", "Loaded custom main menu script: "..mm_script)
+		else
+			core.log("error", "Failed to load custom main menu script: "..mm_script)
+			core.log("info", "Falling back to default main menu script")
+		end
+	end
+	if not custom_loaded then
 		dofile(core.get_mainmenu_path() .. DIR_DELIM .. "init.lua")
 	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
-