Client: disable pre v25 init sending by default

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

diff --git a/builtin/mainmenu/tab_server.lua b/builtin/mainmenu/tab_server.lua
index 1efe803b7585c5f0a5a960f4a9cf9c592e52e002..6b96825a0fbd6b3f38255cba7ed80b44837a381c 100644 (file)
--- a/builtin/mainmenu/tab_server.lua
+++ b/builtin/mainmenu/tab_server.lua
@@ -23,33 +23,33 @@ local function get_formspec(tabview, name, tabdata)
                                )
 
        local retval =
-               "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.9;3.25,0.5;start_server;".. fgettext("Start Game") .. "]" ..
-               "label[4,-0.25;".. fgettext("Select World:") .. "]"..
-               "vertlabel[0,-0.25;".. fgettext("START SERVER") .. "]" ..
-               "checkbox[0.5,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") .. ";" ..
-               dump(core.setting_getbool("enable_damage")) .. "]"..
-               "checkbox[0.5,1.15;cb_server_announce;".. fgettext("Public") .. ";" ..
-               dump(core.setting_getbool("server_announce")) .. "]"..
-               "field[0.8,3.2;3.5,0.5;te_playername;".. fgettext("Name") .. ";" ..
-               core.setting_get("name") .. "]" ..
-               "pwdfield[0.8,4.2;3.5,0.5;te_passwd;".. fgettext("Password") .. "]"
-               
+               "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;start_server;" .. fgettext("Start Game") .. "]" ..
+               "label[4,-0.25;" .. fgettext("Select World:") .. "]" ..
+               "checkbox[0.25,0.25;cb_creative_mode;" .. fgettext("Creative Mode") .. ";" ..
+               dump(core.setting_getbool("creative_mode")) .. "]" ..
+               "checkbox[0.25,0.7;cb_enable_damage;" .. fgettext("Enable Damage") .. ";" ..
+               dump(core.setting_getbool("enable_damage")) .. "]" ..
+               "checkbox[0.25,1.15;cb_server_announce;" .. fgettext("Public") .. ";" ..
+               dump(core.setting_getbool("server_announce")) .. "]" ..
+               "label[0.25,2.2;" .. fgettext("Name/Password") .. "]" ..
+               "field[0.55,3.2;3.5,0.5;te_playername;;" ..
+               core.formspec_escape(core.setting_get("name")) .. "]" ..
+               "pwdfield[0.55,4;3.5,0.5;te_passwd;]"
+
        local bind_addr = core.setting_get("bind_address")
        if bind_addr ~= nil and bind_addr ~= "" then
                retval = retval ..
-                       "field[0.8,5.2;2.25,0.5;te_serveraddr;".. fgettext("Bind Address") .. ";" ..
-                       core.setting_get("bind_address") .."]" ..
-                       "field[3.05,5.2;1.25,0.5;te_serverport;".. fgettext("Port") .. ";" ..
-                       core.setting_get("port") .."]"
+                       "field[0.55,5.2;2.25,0.5;te_serveraddr;" .. fgettext("Bind Address") .. ";" ..
+                       core.formspec_escape(core.setting_get("bind_address")) .. "]" ..
+                       "field[2.8,5.2;1.25,0.5;te_serverport;" .. fgettext("Port") .. ";" ..
+                       core.formspec_escape(core.setting_get("port")) .. "]"
        else
                retval = retval ..
-                       "field[0.8,5.2;3.5,0.5;te_serverport;".. fgettext("Server Port") .. ";" ..
-                       core.setting_get("port") .."]"
+                       "field[0.55,5.2;3.5,0.5;te_serverport;" .. fgettext("Server Port") .. ";" ..
+                       core.formspec_escape(core.setting_get("port")) .. "]"
        end
        
        retval = retval ..
@@ -67,6 +67,9 @@ local function main_button_handler(this, fields, name, tabdata)
 
        if fields["srv_worlds"] ~= nil then
                local event = core.explode_textlist_event(fields["srv_worlds"])
+               local selected = core.get_textlist_index("srv_worlds")
+
+               menu_worldmt_legacy(selected)
 
                if event.type == "DCL" then
                        world_doubleclick = true
@@ -74,6 +77,7 @@ local function main_button_handler(this, fields, name, tabdata)
                if event.type == "CHG" then
                        core.setting_set("mainmenu_last_selected_world",
                                menudata.worldlist:get_raw_index(core.get_textlist_index("srv_worlds")))
+                       return true
                end
        end
 
@@ -83,26 +87,38 @@ 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("srv_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("srv_worlds")
+               menu_worldmt(selected, "enable_damage", fields["cb_enable_damage"])
+
+               return true
        end
 
        if fields["cb_server_announce"] then
                core.setting_set("server_announce", fields["cb_server_announce"])
+               local selected = core.get_textlist_index("srv_worlds")
+               menu_worldmt(selected, "server_announce", fields["cb_server_announce"])
+
+               return true
        end
 
        if fields["start_server"] ~= nil or
                world_doubleclick or
                fields["key_enter"] then
                local selected = core.get_textlist_index("srv_worlds")
-               if selected ~= nil then
+               gamedata.selected_world = menudata.worldlist:get_raw_index(selected)
+               if selected ~= nil and gamedata.selected_world ~= 0 then
                        gamedata.playername     = fields["te_playername"]
                        gamedata.password       = fields["te_passwd"]
                        gamedata.port           = fields["te_serverport"]
                        gamedata.address        = ""
-                       gamedata.selected_world = menudata.worldlist:get_raw_index(selected)
 
                        core.setting_set("port",gamedata.port)
                        if fields["te_serveraddr"] ~= nil then
@@ -111,14 +127,20 @@ local function main_button_handler(this, fields, name, tabdata)
 
                        --update last game
                        local world = menudata.worldlist:get_raw_element(gamedata.selected_world)
-                       local game,index = gamemgr.find_by_gameid(world.gameid)
-                       core.setting_set("menu_last_game",game.id)
+                       if world then
+                               local game, index = gamemgr.find_by_gameid(world.gameid)
+                               core.setting_set("menu_last_game", game.id)
+                       end
+                       
                        core.start()
+               else
+                       gamedata.errormessage =
+                               fgettext("No world created or selected!")
                end
+               return true
        end
 
        if fields["world_create"] ~= nil then
-               print("create world dialog")
                local create_world_dlg = create_create_world_dlg(true)
                create_world_dlg:set_parent(this)
                create_world_dlg:show()
@@ -164,10 +186,10 @@ local function main_button_handler(this, fields, name, tabdata)
 end
 
 --------------------------------------------------------------------------------
-tab_server = {
+return {
        name = "server",
        caption = fgettext("Server"),
        cbf_formspec = get_formspec,
        cbf_button_handler = main_button_handler,
        on_change = nil
-       }
+}