Add configurable key bindings for hotbar scrolling, and for changing volume.

[oweals/minetest.git] / builtin / mainmenu / tab_singleplayer.lua

diff --git a/builtin/mainmenu/tab_singleplayer.lua b/builtin/mainmenu/tab_singleplayer.lua
index 1f96a85dba288eadc703002a2679b48c6961b214..236de763c9b1f73fe4da79329853282fbae2ff29 100644 (file)
--- a/builtin/mainmenu/tab_singleplayer.lua
+++ b/builtin/mainmenu/tab_singleplayer.lua
@@ -23,9 +23,9 @@ local function current_game()
 end
 
 local function singleplayer_refresh_gamebar()
-       
+
        local old_bar = ui.find_by_name("game_button_bar")
-       
+
        if old_bar ~= nil then
                old_bar:delete()
        end
@@ -38,6 +38,17 @@ local function singleplayer_refresh_gamebar()
                                        core.set_topleft_text(gamemgr.games[j].name)
                                        core.setting_set("menu_last_game",gamemgr.games[j].id)
                                        menudata.worldlist:set_filtercriteria(gamemgr.games[j].id)
+                                       local index = filterlist.get_current_index(menudata.worldlist,
+                                               tonumber(core.setting_get("mainmenu_last_selected_world")))
+                                       if not index or index < 1 then
+                                               local selected = core.get_textlist_index("sp_worlds")
+                                               if selected ~= nil and selected < #menudata.worldlist:get_list() then
+                                                       index = selected
+                                               else
+                                                       index = #menudata.worldlist:get_list()
+                                               end
+                                       end
+                                       menu_worldmt_legacy(index)
                                        return true
                                end
                        end
@@ -46,7 +57,7 @@ local function singleplayer_refresh_gamebar()
 
        local btnbar = buttonbar_create("game_button_bar",
                game_buttonbar_button_handler,
-               {x=-0.3,y=5.65}, "horizontal", {x=12.4,y=1.15})
+               {x=-0.3,y=5.9}, "horizontal", {x=12.4,y=1.15})
 
        for i=1,#gamemgr.games,1 do
                local btn_name = "game_btnbar_" .. gamemgr.games[i].id
@@ -76,7 +87,7 @@ end
 
 local function get_formspec(tabview, name, tabdata)
        local retval = ""
-       
+
        local index = filterlist.get_current_index(menudata.worldlist,
                                tonumber(core.setting_get("mainmenu_last_selected_world"))
                                )
@@ -85,12 +96,11 @@ local function get_formspec(tabview, name, tabdata)
                        "button[4,4.15;2.6,0.5;world_delete;".. fgettext("Delete") .. "]" ..
                        "button[6.5,4.15;2.8,0.5;world_create;".. fgettext("New") .. "]" ..
                        "button[9.2,4.15;2.55,0.5;world_configure;".. fgettext("Configure") .. "]" ..
-                       "button[8.5,4.95;3.25,0.5;play;".. fgettext("Play") .. "]" ..
+                       "button[8.5,5;3.25,0.5;play;".. fgettext("Play") .. "]" ..
                        "label[4,-0.25;".. fgettext("Select World:") .. "]"..
-                       "vertlabel[0,-0.25;".. fgettext("SINGLE PLAYER") .. "]" ..
-                       "checkbox[0.5,0.25;cb_creative_mode;".. fgettext("Creative Mode") .. ";" ..
+                       "checkbox[0.25,0.25;cb_creative_mode;".. fgettext("Creative Mode") .. ";" ..
                        dump(core.setting_getbool("creative_mode")) .. "]"..
-                       "checkbox[0.5,0.7;cb_enable_damage;".. fgettext("Enable Damage") .. ";" ..
+                       "checkbox[0.25,0.7;cb_enable_damage;".. fgettext("Enable Damage") .. ";" ..
                        dump(core.setting_getbool("enable_damage")) .. "]"..
                        "textlist[4,0.25;7.5,3.7;sp_worlds;" ..
                        menu_render_worldlist() ..
@@ -106,14 +116,17 @@ local function main_button_handler(this, fields, name, tabdata)
 
        if fields["sp_worlds"] ~= nil then
                local event = core.explode_textlist_event(fields["sp_worlds"])
+               local selected = core.get_textlist_index("sp_worlds")
+
+               menu_worldmt_legacy(selected)
 
                if event.type == "DCL" then
                        world_doubleclick = true
                end
 
-               if event.type == "CHG" then
+               if event.type == "CHG" and selected ~= nil then
                        core.setting_set("mainmenu_last_selected_world",
-                               menudata.worldlist:get_raw_index(core.get_textlist_index("sp_worlds")))
+                               menudata.worldlist:get_raw_index(selected))
                        return true
                end
        end
@@ -124,11 +137,17 @@ local function main_button_handler(this, fields, name, tabdata)
 
        if fields["cb_creative_mode"] then
                core.setting_set("creative_mode", fields["cb_creative_mode"])
+               local selected = core.get_textlist_index("sp_worlds")
+               menu_worldmt(selected, "creative_mode", fields["cb_creative_mode"])
+
                return true
        end
 
        if fields["cb_enable_damage"] then
                core.setting_set("enable_damage", fields["cb_enable_damage"])
+               local selected = core.get_textlist_index("sp_worlds")
+               menu_worldmt(selected, "enable_damage", fields["cb_enable_damage"])
+
                return true
        end
 
@@ -136,12 +155,14 @@ local function main_button_handler(this, fields, name, tabdata)
                world_doubleclick or
                fields["key_enter"] then
                local selected = core.get_textlist_index("sp_worlds")
+               gamedata.selected_world = menudata.worldlist:get_raw_index(selected)
                
-               if selected ~= nil then
-                       gamedata.selected_world = menudata.worldlist:get_raw_index(selected)
-                       gamedata.singleplayer   = true
-                       
+               if selected ~= nil and gamedata.selected_world ~= 0 then
+                       gamedata.singleplayer = true
                        core.start()
+               else
+                       gamedata.errormessage =
+                               fgettext("No world created or selected!")
                end
                return true
        end
@@ -220,10 +241,10 @@ local function on_change(type, old_tab, new_tab)
 end
 
 --------------------------------------------------------------------------------
-tab_singleplayer = {
+return {
        name = "singleplayer",
        caption = fgettext("Singleplayer"),
        cbf_formspec = get_formspec,
        cbf_button_handler = main_button_handler,
        on_change = on_change
-       }
+}