oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-22 17:18:39 +00:00
Code Wiki Activity

Revert "Fix serverlist not beeing escaped correctly"

Browse source 
This reverts commit 39d03148e5.
This commit is contained in:
kwolekr 2013-07-08 20:21:09 -04:00
parent eedb29346e
commit e1a13608d8
3 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

24
builtin/mainmenu.lua
View file

@ -52,6 +52,12 @@ function render_favourite(spec)
details = details .. " "
end
if spec.port ~= nil then
text = text .. ":" .. spec.port:trim()
else
text = text .. ":??"
end
return text
end
@ -113,8 +119,6 @@ function cleanup_path(temppath)
return temppath
end
--------------------------------------------------------------------------------
function menu.set_texture(identifier,gamedetails)
local texture_set = false
if menu.texturepack ~= nil and gamedetails ~= nil then
@ -700,7 +704,10 @@ function tabbuilder.handle_multiplayer_buttons(fields)
end
if event.typ == "CHG" then
local address = menu.favorites[event.index].address
local address = menu.favorites[event.index].name
if address == nil then
address = menu.favorites[event.index].address
end
local port = menu.favorites[event.index].port
if address ~= nil and
@ -1138,7 +1145,8 @@ function tabbuilder.tab_multiplayer()
retval = retval .. "," .. render_favourite(menu.favorites[i])
end
end
print("cfav: " .. dump(menu.fav_selected))
if menu.fav_selected ~= nil then
retval = retval .. ";" .. menu.fav_selected .. "]"
else
@ -1181,10 +1189,9 @@ function tabbuilder.tab_server()
retval = retval .. "," .. menu.worldlist[i].name ..
" \\[" .. menu.worldlist[i].gameid .. "\\]"
end
retval = retval .. ";" .. index .. "]"
else
retval = retval .. ";0]"
end
retval = retval .. ";" .. index .. "]"
return retval
end
@ -1214,8 +1221,7 @@ end
function tabbuilder.tab_singleplayer()
local index = engine.setting_get("main_menu_singleplayer_world_idx")
if index == nil or
#menu.filtered_game_list_raw() == 0 then
if index == nil then
index = 0
end