BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Simplify how parseElement splits element string (#9726)

Browse Source
This commit is contained in:
Pierre-Yves Rollo 2020-04-25 07:48:04 +02:00 committed by GitHub
parent cee3c5e73d
commit 6cc5c7cbb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/guiFormSpecMenu.cpp
View File

@ -2668,24 +2668,12 @@ void GUIFormSpecMenu::parseElement(parserData* data, const std::string &element)
if (parseVersionDirect(element)) if (parseVersionDirect(element))
return; return;
std::vector<std::string> parts = split(element,'['); size_t pos = element.find('[');
if (pos == std::string::npos)
// ugly workaround to keep compatibility
if (parts.size() > 2) {
if (trim(parts[0]) == "image") {
for (unsigned int i=2;i< parts.size(); i++) {
parts[1] += "[" + parts[i];
}
}
else { return; }
}
if (parts.size() < 2) {
return; return;
}
std::string type = trim(parts[0]); std::string type = trim(element.substr(0, pos));
std::string description = trim(parts[1]); std::string description = element.substr(pos+1);
if (type == "container") { if (type == "container") {
parseContainer(data, description); parseContainer(data, description);