From 2ab28e6875e2f3957b4526a81bb02ca94c6d67a0 Mon Sep 17 00:00:00 2001 From: Craig Davison Date: Mon, 1 Dec 2014 19:41:39 +0000 Subject: Fix Sign Workshop GUI --- roadsigns/workshop.lua | 12 ++++++------ streetsmod/init.lua | 13 ------------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/roadsigns/workshop.lua b/roadsigns/workshop.lua index b693222..c11b167 100644 --- a/roadsigns/workshop.lua +++ b/roadsigns/workshop.lua @@ -18,9 +18,9 @@ local forms = { "list[context;streets:signworkshop_output;6,3;1,1]", "list[current_player;main;2,6;8,1]", "list[current_player;main;2,7.25;8,3;8]", - gui_bg, - gui_bg_img, - gui_slots, + default.gui_bg, + default.gui_bg_img, + default.gui_slots, default.get_hotbar_bg(2, 6) }, active = { @@ -38,9 +38,9 @@ local forms = { "list[context;streets:signworkshop_output;6,3;1,1]", "list[current_player;main;2,6;8,1]", "list[current_player;main;2,7.25;8,3;8]", - gui_bg, - gui_bg_img, - gui_slots, + default.gui_bg, + default.gui_bg_img, + default.gui_slots, default.get_hotbar_bg(2, 6), -- } diff --git a/streetsmod/init.lua b/streetsmod/init.lua index 6e1a2fb..c9b78b6 100644 --- a/streetsmod/init.lua +++ b/streetsmod/init.lua @@ -26,19 +26,6 @@ streets = {} } streets.forms = {} - - --- Support for mimnetest_next's fancy inventories - if gui_bg and gui_bg_img and gui_slots and type(default.get_hotbar_bg) == "function" then - -- Everything fine :) - -- minetest_next rules! :P - else - gui_bg = "" - gui_bg_img = "" - gui_slots = "" - default.get_hotbar_bg = function() return "" end - end - -- rubenwardy: smartfs if not minetest.get_modpath("smartfs") then dofile(streets.modpath .. "/libs/smartfs/smartfs.lua") -- cgit v1.2.3