adrido
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug server name set to address field when using up/down keys 

Show server description above connect button instead of in favorites list
master
sapier 2013-07-12 22:42:50 +02:00 committed by PilzAdam
parent 38bc38cd88
commit a0771d0940
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
builtin/mainmenu.lua
View File

@ -18,10 +18,10 @@ function render_favourite(spec)
if spec.name ~= nil then if spec.name ~= nil then
text = text .. fs_escape_string(spec.name:trim()) text = text .. fs_escape_string(spec.name:trim())
if spec.description ~= nil then -- if spec.description ~= nil and
--TODO make sure there's no invalid chat in spec.description -- fs_escape_string(spec.description):trim() ~= "" then
text = text .. " (" .. fs_escape_string(spec.description) .. ")" -- text = text .. " (" .. fs_escape_string(spec.description) .. ")"
end -- end
else else
if spec.address ~= nil then if spec.address ~= nil then
text = text .. spec.address:trim() text = text .. spec.address:trim()
@ -627,10 +627,7 @@ function tabbuilder.handle_multiplayer_buttons(fields)
if fields["favourites"] ~= nil then if fields["favourites"] ~= nil then
local event = explode_textlist_event(fields["favourites"]) local event = explode_textlist_event(fields["favourites"])
if event.typ == "DCL" then if event.typ == "DCL" then
--gamedata.address = menu.favorites[event.index].name gamedata.address = menu.favorites[event.index].address
if gamedata.address == nil then
gamedata.address = menu.favorites[event.index].address
end
gamedata.port = menu.favorites[event.index].port gamedata.port = menu.favorites[event.index].port
gamedata.playername = fields["te_name"] gamedata.playername = fields["te_name"]
if fields["te_pwd"] ~= nil then if fields["te_pwd"] ~= nil then
@ -681,10 +678,7 @@ function tabbuilder.handle_multiplayer_buttons(fields)
fav_idx = fav_idx +1 fav_idx = fav_idx +1
end end end end
local address = menu.favorites[fav_idx].name local address = menu.favorites[fav_idx].address
if address == nil then
address = menu.favorites[fav_idx].address
end
local port = menu.favorites[fav_idx].port local port = menu.favorites[fav_idx].port
if address ~= nil and if address ~= nil and
@ -1076,6 +1070,15 @@ function tabbuilder.tab_multiplayer()
"button[9,4.95;2.5,0.5;btn_mp_connect;Connect]" .. "button[9,4.95;2.5,0.5;btn_mp_connect;Connect]" ..
"field[9.25,1;2.5,0.5;te_name;;" ..engine.setting_get("name") .."]" .. "field[9.25,1;2.5,0.5;te_name;;" ..engine.setting_get("name") .."]" ..
"pwdfield[9.25,1.75;2.5,0.5;te_pwd;]" .. "pwdfield[9.25,1.75;2.5,0.5;te_pwd;]" ..
"textarea[9.25,2.25;2.5,2.75;;"
if menu.fav_selected ~= nil and
menu.favorites[menu.fav_selected].description ~= nil then
retval = retval ..
fs_escape_string(menu.favorites[menu.fav_selected].description,true)
end
retval = retval ..
";]" ..
"textlist[1,0.35;7.5,3.35;favourites;" "textlist[1,0.35;7.5,3.35;favourites;"
if #menu.favorites > 0 then if #menu.favorites > 0 then