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 5c7e20932e3a09f27738a702d313b88bff71f59e..94345467734943b5f10134224ea317d3b81817f0 100644 (file)
--- a/builtin/mainmenu/init.lua
+++ b/builtin/mainmenu/init.lua
@@ -34,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")
@@ -48,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")
 
@@ -86,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})
@@ -97,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)
@@ -112,7 +113,7 @@ local function init_globals()
        if tv_main.current_tab == "local" then
                local game = pkgmgr.find_by_gameid(core.settings:get("menu_last_game"))
                if game == nil then
-                       mm_texture.reset()
+                       mm_game_theme.reset()
                end
        end
 
@@ -120,8 +121,6 @@ local function init_globals()
        tv_main:show()
 
        ui.update()
-
-       core.sound_play("main_menu", true)
 end
 
 init_globals()