diff options
Diffstat (limited to 'builtin/init.lua')
| -rw-r--r-- | builtin/init.lua | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/builtin/init.lua b/builtin/init.lua index 095771d19..4400a19d6 100644 --- a/builtin/init.lua +++ b/builtin/init.lua @@ -6,32 +6,45 @@ -- -- 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() .. DIR_DELIM +local gamepath = scriptdir .. "game" .. 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) 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") else error(("Unrecognized builtin initialization type %s!"):format(tostring(INIT))) end |