summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubenwardy <rw@rubenwardy.com>2019-09-29 12:40:59 +0100
committerSmallJoker <SmallJoker@users.noreply.github.com>2019-09-29 13:40:59 +0200
commit07bdd6049b6d190de69419cc9be2ac49d3a08e0f (patch)
tree4ecd337e64a6ae3824c8d6eac92b5ea82f6d7789
parent16865a5bf65daae6131f1ad3d0df98be8b01f0f0 (diff)
downloadminetest-07bdd6049b6d190de69419cc9be2ac49d3a08e0f.tar.gz
minetest-07bdd6049b6d190de69419cc9be2ac49d3a08e0f.tar.bz2
minetest-07bdd6049b6d190de69419cc9be2ac49d3a08e0f.zip
Fix error message caused by adding new parameter to background (#8922)
Adds background9[] element to keep backwards compatibility in formspec prepends.
-rw-r--r--doc/lua_api.txt2
-rw-r--r--src/gui/guiFormSpecMenu.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index cefc53569..b4cf65e54 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -2114,7 +2114,7 @@ Elements
* If `auto_clip` is `true`, the background is clipped to the formspec size
(`x` and `y` are used as offset values, `w` and `h` are ignored)
-### `background[<X>,<Y>;<W>,<H>;<texture name>;<auto_clip>;<middle>]`
+### `background9[<X>,<Y>;<W>,<H>;<texture name>;<auto_clip>;<middle>]`
* 9-sliced background. See https://en.wikipedia.org/wiki/9-slice_scaling
* Middle is a rect which defines the middle of the 9-slice.
diff --git a/src/gui/guiFormSpecMenu.cpp b/src/gui/guiFormSpecMenu.cpp
index 390c81bc1..ebcc6b67e 100644
--- a/src/gui/guiFormSpecMenu.cpp
+++ b/src/gui/guiFormSpecMenu.cpp
@@ -2231,8 +2231,8 @@ void GUIFormSpecMenu::parseElement(parserData* data, const std::string &element)
return;
}
- if (type == "background") {
- parseBackground(data,description);
+ if (type == "background" || type == "background9") {
+ parseBackground(data, description);
return;
}