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". --- src/util/string.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/util') diff --git a/src/util/string.h b/src/util/string.h index d9390e33c..7531600e3 100644 --- a/src/util/string.h +++ b/src/util/string.h @@ -307,7 +307,7 @@ inline std::string unescape_string(std::string &s) { std::string res; - for (size_t i = 0; i <= s.length(); i++) { + for (size_t i = 0; i < s.length(); i++) { if (s[i] == '\\') i++; res += s[i]; -- cgit v1.2.3