From 3c4734d69a44aea133e5bd7df66a5dedb87785fb Mon Sep 17 00:00:00 2001 From: Kahrl Date: Tue, 20 Aug 2013 22:38:14 +0200 Subject: Change mainmenu texture handling + small misc changes Texture names must now be escaped in formspec elements image[], background[], image_button[], image_button_exit[]. Instead of special-case handling of texture loading (and unloading which was missing) in guiFormSpecMenu.cpp, use the newly created ISimpleTextureSource interface which is a minimal subset of ITextureSource. There is an implementation of this interface used by GUIEngine (MenuTextureSource). Fix an off-by-one bug in unescape_string; it caused requests for a texture called "\0". --- builtin/modstore.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'builtin/modstore.lua') diff --git a/builtin/modstore.lua b/builtin/modstore.lua index 2f967c9b1..43f7759ad 100644 --- a/builtin/modstore.lua +++ b/builtin/modstore.lua @@ -227,7 +227,7 @@ function modstore.getmodlist(list) end retval = retval .. "image[0,".. screenshot_ypos .. ";3,2;" .. - list.data[i].texturename .. "]" + engine.formspec_escape(list.data[i].texturename) .. "]" --title + author retval = retval .."label[2.75," .. screenshot_ypos .. ";" .. -- cgit v1.2.3