SAPI: Throw runtime error instead of if l_get_mapgen_object called in incorrect thread

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

diff --git a/builtin/mainmenu/tab_simple_main.lua b/builtin/mainmenu/tab_simple_main.lua
index b9a6b650fa74b57d7370824c69a1ef2890505ab6..434113b5f662155b7bff60d59686b0b66668a1a0 100644 (file)
--- a/builtin/mainmenu/tab_simple_main.lua
+++ b/builtin/mainmenu/tab_simple_main.lua
@@ -69,20 +69,18 @@ local function get_formspec(tabview, name, tabdata)
 
        -- separator
        retval = retval ..
-               "box[-0.3,3.75;12.4,0.1;#FFFFFF]"
+               "box[-0.28,3.75;12.4,0.1;#FFFFFF]"
 
        -- checkboxes
        retval = retval ..
-               "checkbox[1.0,3.9;cb_creative;".. fgettext("Creative Mode") .. ";" ..
+               "checkbox[8.0,3.9;cb_creative;".. fgettext("Creative Mode") .. ";" ..
                dump(core.setting_getbool("creative_mode")) .. "]"..
-               "checkbox[5.0,3.9;cb_damage;".. fgettext("Enable Damage") .. ";" ..
-               dump(core.setting_getbool("enable_damage")) .. "]" ..
-               "checkbox[8,3.9;cb_fly_mode;".. fgettext("Fly mode") .. ";" ..
-               dump(core.setting_getbool("free_move")) .. "]"
+               "checkbox[8.0,4.4;cb_damage;".. fgettext("Enable Damage") .. ";" ..
+               dump(core.setting_getbool("enable_damage")) .. "]"
        -- buttons
        retval = retval ..
-               "button[2.0,4.5;6,1.5;btn_start_singleplayer;" .. fgettext("Start Singleplayer") .. "]" ..
-               "button[8.25,4.5;2.5,1.5;btn_config_sp_world;" .. fgettext("Config mods") .. "]"
+               "button[0,3.7;8,1.5;btn_start_singleplayer;" .. fgettext("Start Singleplayer") .. "]" ..
+               "button[0,4.5;8,1.5;btn_config_sp_world;" .. fgettext("Config mods") .. "]"
 
        return retval
 end
@@ -98,12 +96,12 @@ local function main_button_handler(tabview, fields, name, tabdata)
        end
 
        if fields["favourites"] ~= nil then
-               local event = core.explode_textlist_event(fields["favourites"])
+               local event = core.explode_table_event(fields["favourites"])
 
                if event.type == "CHG" then
-                       if event.index <= #menudata.favorites then
-                               local address = menudata.favorites[event.index].address
-                               local port = menudata.favorites[event.index].port
+                       if event.row <= #menudata.favorites then
+                               local address = menudata.favorites[event.row].address
+                               local port = menudata.favorites[event.row].port
 
                                if address ~= nil and
                                        port ~= nil then
@@ -111,7 +109,7 @@ local function main_button_handler(tabview, fields, name, tabdata)
                                        core.setting_set("remote_port",port)
                                end
 
-                               tabdata.fav_selected = event.index
+                               tabdata.fav_selected = event.row
                        end
                end
                return true
@@ -138,11 +136,6 @@ local function main_button_handler(tabview, fields, name, tabdata)
                return true
        end
 
-       if fields["cb_fly_mode"] then
-               core.setting_set("free_move", fields["cb_fly_mode"])
-               return true
-       end
-
        if fields["btn_mp_connect"] ~= nil or
                fields["key_enter"] ~= nil then