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

Fixed not being able to set unit.ellipse variable if ellipse= is set by [unit_type] or [object]

Browse source 
This allows {MAKE_HERO} to work properly even in these cases.
This commit is contained in:
Elvish_Hunter 2015-04-04 11:21:59 +02:00
parent afab09aae9
commit 157066c512
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -287,6 +287,8 @@ Version 1.13.0-dev:
* Imagepath function "~NEG": gives the image a photographic negative effect
* Dropped support for [filter_side] in [gold] and [modify_ai], [theme] name=
in place of id, and [object] duration=level.
* Allowed direct modification of unit.ellipse variable even if ellipse= is set
in [unit_type] or by an [object]
* Miscellaneous and bug fixes:
* replace 'fight_on_without_leader'=yes/no with defeat_condition=no_leader/
no_units/always/never which allows the wml developer to decide when a side

3
src/unit.cpp
View file

@ -392,6 +392,9 @@ unit::unit(const config &cfg, bool use_traits, const vconfig* vcfg)
if (const config::attribute_value *v = cfg.get("cost")) {
unit_value_ = *v;
}
if (const config::attribute_value *v = cfg.get("ellipse")) {
cfg_["ellipse"] = *v;
}
if (const config::attribute_value *v = cfg.get("halo")) {
anim_comp_->clear_haloes();
cfg_["halo"] = *v;