Fix error message caused by adding new parameter to background (#8922)

rubenwardy · SmallJoker · commit 07bdd6049b6d · 2019-09-29T13:40:59.000+02:00
Adds background9[] element to keep backwards compatibility in formspec prepends.
diff --git 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
@@ -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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -2231,8 +2231,8 @@ void GUIFormSpecMenu::parseElement(parserData* data, const std::string &element)`
`2231`	`2231`	`return;`
`2232`	`2232`	`}`
`2233`	`2233`
`2234`		`- if (type == "background") {`
`2235`		`- parseBackground(data,description);`
	`2234`	`+ if (type == "background" \|\| type == "background9") {`
	`2235`	`+ parseBackground(data, description);`
`2236`	`2236`	`return;`
`2237`	`2237`	`}`
`2238`	`2238`