diff options
author | codexp <codexp@gmx.net> | 2018-06-23 15:37:13 +0200 |
---|---|---|
committer | codexp <codexp@gmx.net> | 2018-06-23 15:37:13 +0200 |
commit | 3988f4c57224e2754c2c0f50465ea8a3bf17ac45 (patch) | |
tree | 6ccf9af5ebee14c77c10e16f3381d304dd4c6b6c /register.lua | |
parent | 934757edd6889284debc326e92c99d0217f6cb4d (diff) | |
parent | edd00f222c02f2e0f42f0c9bf52de74c41bf12b9 (diff) |
Merge origin/master to refactor-translation branch (resolving conflicts)
Diffstat (limited to 'register.lua')
-rw-r--r-- | register.lua | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/register.lua b/register.lua index 27c8259..dd2b3cc 100644 --- a/register.lua +++ b/register.lua @@ -290,6 +290,8 @@ unified_inventory.register_page("craftguide", { alternates = #crafts craft = crafts[alternate] end + local has_creative = player_privs.give or player_privs.creative or + minetest.settings:get_bool("creative_mode") formspec = formspec.."background[0.5,"..(formspecy + 0.2)..";8,3;ui_craftguide_form.png]" formspec = formspec.."textarea["..craftresultx..","..craftresulty @@ -305,7 +307,7 @@ unified_inventory.register_page("craftguide", { formspec = formspec.."image["..no_pos..","..formspecy..";1.1,1.1;ui_no.png]" formspec = formspec..stack_image_button(item_pos, formspecy, 1.1, 1.1, "item_button_" ..other_dir[dir].."_", ItemStack(item_name)) - if player_privs.give == true or player_privs.creative == true or minetest.setting_getbool("creative_mode") == true then + if has_creative then formspec = formspec.."label[0,"..(formspecy + 2.10)..";" .. F(S("Give me:")) .. "]" .."button[0, "..(formspecy + 2.7)..";0.6,0.5;craftguide_giveme_1;1]" .."button[0.6,"..(formspecy + 2.7)..";0.7,0.5;craftguide_giveme_10;10]" @@ -382,7 +384,7 @@ unified_inventory.register_page("craftguide", { .."button[0.6,"..(formspecy + 1.5)..";0.7,0.5;craftguide_craft_10;10]" .."button[1.3,"..(formspecy + 1.5)..";0.8,0.5;craftguide_craft_max;" .. F(S("All")) .. "]" end - if player_privs.give == true or player_privs.creative == true or minetest.setting_getbool("creative_mode") == true then + if has_creative then formspec = formspec.."label[0,"..(formspecy + 2.1)..";" .. F(S("Give me:")) .. "]" .."button[0, "..(formspecy + 2.7)..";0.6,0.5;craftguide_giveme_1;1]" .."button[0.6,"..(formspecy + 2.7)..";0.7,0.5;craftguide_giveme_10;10]" |