diff options
| author | Rui914 <rui914t@gmail.com> | 2016-03-31 17:26:39 +0900 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2016-04-08 02:25:04 -0400 |
| commit | 92d4a738435c4b8d5944375c596befcc15b3f47c (patch) | |
| tree | dd536cc1559cecc52da61c1b87f1519eceb0a664 /builtin/init.lua | |
| parent | 27ee8d8943080a5dd735c9faa47c726604bafdff (diff) | |
| download | minetest-92d4a738435c4b8d5944375c596befcc15b3f47c.tar.gz minetest-92d4a738435c4b8d5944375c596befcc15b3f47c.tar.bz2 minetest-92d4a738435c4b8d5944375c596befcc15b3f47c.zip | |
Mainmenu: Refactor tab UI code
- Use local variables for tabs in place of globals
- Merge together if statements where possible
- Replace manual table searching code with indexof where possible
Diffstat (limited to 'builtin/init.lua')
| -rw-r--r-- | builtin/init.lua | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/builtin/init.lua b/builtin/init.lua index 6b27cf76e..4400a19d6 100644 --- 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 @@ -25,26 +25,26 @@ 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 |