Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / builtin / mainmenu / init.lua

diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua
index b7e867d2e736b70fe2c5c75bcca8b4b54b08742d..94345467734943b5f10134224ea317d3b81817f0 100644 (file)
--- a/builtin/mainmenu/init.lua
+++ b/builtin/mainmenu/init.lua
@@ -19,6 +19,7 @@ mt_color_grey  = "#AAAAAA"
 mt_color_blue  = "#6389FF"
 mt_color_green = "#72FF63"
 mt_color_dark_green = "#25C191"
+mt_color_orange  = "#FF8800"
 
 local menupath = core.get_mainmenu_path()
 local basepath = core.get_builtin_path()
@@ -33,7 +34,8 @@ dofile(basepath .. "fstk" .. DIR_DELIM .. "ui.lua")
 dofile(menupath .. DIR_DELIM .. "async_event.lua")
 dofile(menupath .. DIR_DELIM .. "common.lua")
 dofile(menupath .. DIR_DELIM .. "pkgmgr.lua")
-dofile(menupath .. DIR_DELIM .. "textures.lua")
+dofile(menupath .. DIR_DELIM .. "serverlistmgr.lua")
+dofile(menupath .. DIR_DELIM .. "game_theme.lua")
 
 dofile(menupath .. DIR_DELIM .. "dlg_config_world.lua")
 dofile(menupath .. DIR_DELIM .. "dlg_settings_advanced.lua")
@@ -47,7 +49,7 @@ local tabs = {}
 
 tabs.settings = dofile(menupath .. DIR_DELIM .. "tab_settings.lua")
 tabs.content  = dofile(menupath .. DIR_DELIM .. "tab_content.lua")
-tabs.credits  = dofile(menupath .. DIR_DELIM .. "tab_credits.lua")
+tabs.about    = dofile(menupath .. DIR_DELIM .. "tab_about.lua")
 tabs.local_game = dofile(menupath .. DIR_DELIM .. "tab_local.lua")
 tabs.play_online = dofile(menupath .. DIR_DELIM .. "tab_online.lua")
 
@@ -85,7 +87,7 @@ local function init_globals()
                core.settings:set("menu_last_game", default_game)
        end
 
-       mm_texture.init()
+       mm_game_theme.init()
 
        -- Create main tabview
        local tv_main = tabview_create("maintab", {x = 12, y = 5.4}, {x = 0, y = 0})
@@ -96,7 +98,7 @@ local function init_globals()
 
        tv_main:add(tabs.content)
        tv_main:add(tabs.settings)
-       tv_main:add(tabs.credits)
+       tv_main:add(tabs.about)
 
        tv_main:set_global_event_handler(main_event_handler)
        tv_main:set_fixed_size(false)
@@ -105,12 +107,20 @@ local function init_globals()
        if last_tab and tv_main.current_tab ~= last_tab then
                tv_main:set_tab(last_tab)
        end
+
+       -- In case the folder of the last selected game has been deleted,
+       -- display "Minetest" as a header
+       if tv_main.current_tab == "local" then
+               local game = pkgmgr.find_by_gameid(core.settings:get("menu_last_game"))
+               if game == nil then
+                       mm_game_theme.reset()
+               end
+       end
+
        ui.set_default("maintab")
        tv_main:show()
 
        ui.update()
-
-       core.sound_play("main_menu", true)
 end
 
 init_globals()