Store vector metatable in registry

[dragonfireclient.git] / builtin / init.lua

diff --git a/builtin/init.lua b/builtin/init.lua
index 4f55e80346fdc73f6845edb05c5b5480bcf72173..7a9b5c42718002d7cc75b6d31712ce7b5b2bc1a2 100644 (file)
--- a/builtin/init.lua
+++ b/builtin/init.lua
@@ -6,27 +6,60 @@
 --
 
 -- 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 .. "vector.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")
+       assert(not core.get_http_api)
 elseif INIT == "mainmenu" then
-       dofile(core.get_mainmenu_path()..DIR_DELIM.."init.lua")
+       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")
+       dofile(asyncpath .. "init.lua")
+elseif INIT == "client" then
+       dofile(clientpath .. "init.lua")
 else
        error(("Unrecognized builtin initialization type %s!"):format(tostring(INIT)))
 end
-