crabman77/awards
1
0
Fork 0
forked from nalc/awards
Code Issues Pull Requests Projects Releases Wiki Activity

Fix crash for invalid award index selection

Browse Source
This commit is contained in:
SmallJoker 2018-07-15 14:17:06 +02:00 committed by rubenwardy
parent 8c0bb00b1a
commit 32150bdd66
1 changed files with 46 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gui.lua
View File

@ -75,28 +75,27 @@ function awards.get_formspec(name, to, sid)
formspec = formspec .. "button_exit[4.2,2.3;3,1;close;"..minetest.formspec_escape(S("OK")).."]"
return formspec
end
sid = awards_list[sid] and sid or 1
-- Sidebar
if sid then
local item = awards_list[sid+0]
local def = item.def
if def and def.secret and not item.unlocked then
local sitem = awards_list[sid]
local sdef = sitem.def
if sdef and sdef.secret and not sitem.unlocked then
formspec = formspec .. "label[1,2.75;"..
minetest.formspec_escape(S("(Secret Award)")).."]"..
"image[1,0;3,3;awards_unknown.png]"
if def and def.description then
if sdef and sdef.description then
formspec = formspec .. "textarea[0.25,3.25;4.8,1.7;;"..
minetest.formspec_escape(
S("Unlock this award to find out what it is."))..";]"
end
else
local title = item.name
if def and def.title then
title = def.title
local title = sitem.name
if sdef and sdef.title then
title = sdef.title
end
local status = "%s"
if item.unlocked then
if sitem.unlocked then
status = S("%s (unlocked)")
end
@ -104,14 +103,14 @@ function awards.get_formspec(name, to, sid)
string.format(status, minetest.formspec_escape(title)) ..
";]"
if def and def.icon then
formspec = formspec .. "image[1,0;3,3;" .. def.icon .. "]"
if sdef and sdef.icon then
formspec = formspec .. "image[1,0;3,3;" .. sdef.icon .. "]"
end
local barwidth = 4.6
local perc = nil
local label = nil
if def.getProgress and data then
local res = def:getProgress(data)
if sdef.getProgress and data then
local res = sdef:getProgress(data)
perc = res.perc
label = res.label
end
@ -125,9 +124,8 @@ function awards.get_formspec(name, to, sid)
formspec = formspec .. "label[1.75,4.63;" .. minetest.formspec_escape(label) .. "]"
end
end
if def and def.description then
formspec = formspec .. "textarea[0.25,3.75;4.8,1.7;;"..minetest.formspec_escape(def.description)..";]"
end
if sdef and sdef.description then
formspec = formspec .. "textarea[0.25,3.75;4.8,1.7;;"..minetest.formspec_escape(sdef.description)..";]"
end
end
@ -199,9 +197,6 @@ function awards.show_to(name, to, sid, text)
end
end
else
if sid == nil or sid < 1 then
sid = 1
end
local deco = ""
if minetest.global_exists("default") then
deco = default.gui_bg .. default.gui_bg_img
@ -226,7 +221,7 @@ if minetest.get_modpath("sfinv") then
get = function(self, player, context)
local name = player:get_player_name()
return sfinv.make_formspec(player, context,
awards.get_formspec(name, name, context.awards_idx or 1),
awards.get_formspec(name, name, context.awards_idx),
false, "size[11,5]")
end,
on_player_receive_fields = function(self, player, context, fields)