0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed broken gui.get_user_choice()

Browse source
This commit is contained in:
Elvish_Hunter 2022-01-08 22:03:12 +01:00
parent 7340f51743
commit 5b18f2df4c
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
data/lua/core/gui.lua
View file

@ -35,10 +35,23 @@ function gui.get_user_choice(attr, options)
msg[k] = attr[k]
end
for k,v in ipairs(options) do
table.insert(msg, wml.tag.option, { message = v,
wml.tag.command, { wml.tag.lua, {
code = string.format("gui.__user_choice_helper(%d)", k)
}}})
if type(v) == "table" or (type(v) == "userdata" and getmetatable(v) ~= "translatable string") then
table.insert(msg, wml.tag.option { image = v.image,
label = v.label,
description = v.description or v.message,
default = v.default,
wml.tag.command { wml.tag.lua {
code = string.format("gui.__user_choice_helper(%d)", k)
}}})
elseif type(v) == "string" or type(v) == "number" or type(v) == "boolean" or
(type(v) == "userdata" and getmetatable(v) == "translatable string") then
table.insert(msg, wml.tag.option { description = v,
wml.tag.command { wml.tag.lua {
code = string.format("gui.__user_choice_helper(%d)", k)
}}})
else -- only function and thread, because nil stops the cycle anyway
error(string.format("Invalid data type in gui.get_user_choice (type: %s)", type(v)))
end
end
wesnoth.wml_actions.message(msg)
gui.__user_choice_helper = nil