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

Formspecs: Fix invalid background warning

Browse Source 
Clipped backgrounds are still valid with no size[] tag, as they will apply themselves correctly to any size

Fixes #7197
This commit is contained in:
rubenwardy 2018-08-20 13:56:16 +01:00 committed by GitHub
parent 3cc25b700a
commit 5a26e46aaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/guiFormSpecMenu.cpp
View File

@ -668,15 +668,16 @@ void GUIFormSpecMenu::parseBackground(parserData* data, const std::string &eleme
geom.X = stof(v_geom[0]) * spacing.X; geom.X = stof(v_geom[0]) * spacing.X;
geom.Y = stof(v_geom[1]) * spacing.Y; geom.Y = stof(v_geom[1]) * spacing.Y;
if (!data->explicit_size)
warningstream<<"invalid use of background without a size[] element"<<std::endl;
bool clip = false; bool clip = false;
if (parts.size() == 4 && is_yes(parts[3])) { if (parts.size() == 4 && is_yes(parts[3])) {
pos.X = stoi(v_pos[0]); //acts as offset pos.X = stoi(v_pos[0]); //acts as offset
pos.Y = stoi(v_pos[1]); //acts as offset pos.Y = stoi(v_pos[1]); //acts as offset
clip = true; clip = true;
} }
if (!data->explicit_size && !clip)
warningstream << "invalid use of unclipped background without a size[] element" << std::endl;
m_backgrounds.emplace_back(name, pos, geom, clip); m_backgrounds.emplace_back(name, pos, geom, clip);
return; return;