diff options
author | Kahrl <kahrl@gmx.net> | 2013-08-20 22:38:14 +0200 |
---|---|---|
committer | Kahrl <kahrl@gmx.net> | 2013-09-11 00:08:56 +0200 |
commit | 3c4734d69a44aea133e5bd7df66a5dedb87785fb (patch) | |
tree | f3961c8855c0d864b672ae79857de9b993c3e95c /src/util | |
parent | da9fe6485134ec81cc3628b1bc4847c3b2226c76 (diff) | |
download | minetest-3c4734d69a44aea133e5bd7df66a5dedb87785fb.tar.gz minetest-3c4734d69a44aea133e5bd7df66a5dedb87785fb.tar.bz2 minetest-3c4734d69a44aea133e5bd7df66a5dedb87785fb.zip |
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".
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/string.h | 2 |
1 files changed, 1 insertions, 1 deletions
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]; |