erle
/
mainmenu_csm
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix serverlist not beeing escaped correctly Always use address for server Fix first (empty) element beeing selected after deleting last world

This commit is contained in:
sapier 2013-07-08 23:45:14 +02:00 committed by Nils Dagsson Moskopp
parent c82ccfcf2d
commit 32cf551e9d
Signed by: erle
GPG Key ID: A3BC671C35191080
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
builtin/mainmenu.lua
View File

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

8
builtin/mainmenu_helper.lua
View File

@ -77,9 +77,11 @@ function fs_escape_string(text)
text = newtext
end
text = text:gsub("%[","\\%[")
text = text:gsub("]","\\]")
text = text:gsub(";","\\;")
text = string.gsub(text,"\\","\\\\")
text = string.gsub(text,"%]","\\]")
text = string.gsub(text,"%[","\\[")
text = string.gsub(text,";","\\;")
text = string.gsub(text,",","\\,")
end
return text
end