diff options
| author | Christian <Christian_D_97@gmx.de> | 2014-12-01 21:19:21 +0100 |
|---|---|---|
| committer | Christian <Christian_D_97@gmx.de> | 2014-12-01 21:19:21 +0100 |
| commit | 7803637fb62911f84a8b7d2f9cc1efa2cab553ca (patch) | |
| tree | 3b5323215a9fec976998bd3fd447f46b21740d4c | |
| parent | d812ff03f2b36a710497ef4028f9a96aa1ecb133 (diff) | |
| parent | 2ab28e6875e2f3957b4526a81bb02ca94c6d67a0 (diff) | |
| download | roads-7803637fb62911f84a8b7d2f9cc1efa2cab553ca.tar roads-7803637fb62911f84a8b7d2f9cc1efa2cab553ca.tar.gz roads-7803637fb62911f84a8b7d2f9cc1efa2cab553ca.tar.bz2 roads-7803637fb62911f84a8b7d2f9cc1efa2cab553ca.tar.xz roads-7803637fb62911f84a8b7d2f9cc1efa2cab553ca.zip | |
Merge pull request #34 from CraigyDavi/gui-fix
Fix Sign Workshop GUI - thanks :)
| -rw-r--r-- | roadsigns/workshop.lua | 12 | ||||
| -rw-r--r-- | 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") |