summaryrefslogtreecommitdiff
path: root/builtin/mainmenu/init.lua
diff options
context:
space:
mode:
authorElijah Duffy <enduffy2014@outlook.com>2017-05-21 01:07:05 -0700
committerLoïc Blot <nerzhul@users.noreply.github.com>2017-05-21 10:07:05 +0200
commit4dc97eb99fdbeec186cce5b03c64fb1df319d19d (patch)
tree08bf9e20d86fd8ecefe51c8fa559d3d3fbcd2237 /builtin/mainmenu/init.lua
parent50cb503d77aa09c5dbc9b6953b06e2ed80713d8c (diff)
downloadminetest-4dc97eb99fdbeec186cce5b03c64fb1df319d19d.tar.gz
minetest-4dc97eb99fdbeec186cce5b03c64fb1df319d19d.tar.bz2
minetest-4dc97eb99fdbeec186cce5b03c64fb1df319d19d.zip
Menu: Merge singleplayer and server tabs (#5627)
Rename "Singleplayer" tab to "Play" and remove "Server" tab placing server functionality under a "Host Game" checkbox in "Play."
Diffstat (limited to 'builtin/mainmenu/init.lua')
-rw-r--r--builtin/mainmenu/init.lua11
1 files changed, 4 insertions, 7 deletions
diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua
index 492bb22d6..7c6af7d27 100644
--- a/builtin/mainmenu/init.lua
+++ b/builtin/mainmenu/init.lua
@@ -56,9 +56,8 @@ tabs.credits = dofile(menupath .. DIR_DELIM .. "tab_credits.lua")
if PLATFORM == "Android" then
tabs.simple_main = dofile(menupath .. DIR_DELIM .. "tab_simple_main.lua")
else
- tabs.singleplayer = dofile(menupath .. DIR_DELIM .. "tab_singleplayer.lua")
- tabs.multiplayer = dofile(menupath .. DIR_DELIM .. "tab_multiplayer.lua")
- tabs.server = dofile(menupath .. DIR_DELIM .. "tab_server.lua")
+ tabs.local_game = dofile(menupath .. DIR_DELIM .. "tab_local.lua")
+ tabs.play_online = dofile(menupath .. DIR_DELIM .. "tab_online.lua")
tabs.texturepacks = dofile(menupath .. DIR_DELIM .. "tab_texturepacks.lua")
end
@@ -135,9 +134,8 @@ local function init_globals()
tv_main:add(tabs.settings)
else
tv_main:set_autosave_tab(true)
- tv_main:add(tabs.singleplayer)
- tv_main:add(tabs.multiplayer)
- tv_main:add(tabs.server)
+ tv_main:add(tabs.local_game)
+ tv_main:add(tabs.play_online)
tv_main:add(tabs.settings)
tv_main:add(tabs.texturepacks)
end
@@ -167,4 +165,3 @@ local function init_globals()
end
init_globals()
-