0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle empty children in patch_movetype (#5582)

Browse source 
In movetype::write, the children might not be created if that child has an
empty config; there might be no child at all for movetypes such as "none". The
movetype "none" is a real movetype defined in units.cfg for units that
shouldn't be able to move.

The original_cfg local variable was only used once anyway, removing it and the
comment made the code clearer.

This wasn't caught in the 1.15 testing, but with 1.14 it resulted in a
"mandatory WML child missing" warning.
This commit is contained in:
Steve Cotton 2021-03-03 08:57:01 +01:00 • committed by GitHub
parent 0e449be887
commit 0035b776d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/units/types.cpp
View file

@ -885,12 +885,8 @@ void patch_movetype(movetype& mt,
config mt_cfg;
mt.write(mt_cfg);
// original_cfg can be blank, if a movetype similar to "none" exists.
// "none" is a real movetype defined in units.cfg for units that shouldn't
// be able to move.
const auto& original_cfg = mt_cfg.child(type_to_patch);
if(!replace && original_cfg.has_attribute(new_key)) {
// Don't replace if the key already exists in the config (even if empty).
if(!replace && mt_cfg.child_or_empty(type_to_patch).has_attribute(new_key)) {
// Don't replace if this type already exists in the config
return;
}