From: Mikko Rasa Date: Mon, 3 Sep 2018 15:30:25 +0000 (+0300) Subject: Correctly merge icon and light beam appearances X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;ds=inline;p=poefilter.git Correctly merge icon and light beam appearances --- diff --git a/source/appearance.cpp b/source/appearance.cpp index cb132fd..51ff10d 100644 --- a/source/appearance.cpp +++ b/source/appearance.cpp @@ -33,6 +33,18 @@ void Appearance::merge_from(const Appearance &other) sound_type = other.sound_type; sound_volume = other.sound_volume; } + if(other.show_icon) + { + show_icon = true; + icon_shape = other.icon_shape; + icon_color = other.icon_color; + icon_size = other.icon_size; + } + if(other.show_beam) + { + show_beam = true; + beam_color = other.beam_color; + } } void Appearance::add_lines(FilterStatement &st) const