From 21196e822f7cc1122717a9fe03554408369e18d2 Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Wed, 4 Jan 2023 19:36:18 +0200 Subject: [PATCH] Fixed blue tint for clones --- client/battle/BattleStacksController.cpp | 4 ++-- client/gui/ColorFilter.cpp | 5 +++++ client/gui/ColorFilter.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/client/battle/BattleStacksController.cpp b/client/battle/BattleStacksController.cpp index 78ce32836..19a0b80ad 100644 --- a/client/battle/BattleStacksController.cpp +++ b/client/battle/BattleStacksController.cpp @@ -225,7 +225,7 @@ void BattleStacksController::stackAdded(const CStack * stack, bool instant) { addNewAnim(new ColorTransformAnimation(owner, stack, "summonFadeIn", nullptr)); if (stack->isClone()) - addNewAnim(new ColorTransformAnimation(owner, stack, "cloning", nullptr)); + addNewAnim(new ColorTransformAnimation(owner, stack, "cloning", SpellID(SpellID::CLONE).toSpell() )); }); } } @@ -816,7 +816,7 @@ void BattleStacksController::removeExpiredColorFilters() { if (filter.persistent) return false; - if (filter.effect == ColorFilter::genEmptyShifter()) + if (filter.effect != ColorFilter::genEmptyShifter()) return false; if (filter.source && filter.target->hasBonus(Selector::source(Bonus::SPELL_EFFECT, filter.source->id), Selector::all)) return false; diff --git a/client/gui/ColorFilter.cpp b/client/gui/ColorFilter.cpp index 98020134f..52713d8af 100644 --- a/client/gui/ColorFilter.cpp +++ b/client/gui/ColorFilter.cpp @@ -34,6 +34,11 @@ SDL_Color ColorFilter::shiftColor(const SDL_Color & in) const }; } +bool ColorFilter::operator != (const ColorFilter & other) const +{ + return !(this->operator==(other)); +} + bool ColorFilter::operator == (const ColorFilter & other) const { return diff --git a/client/gui/ColorFilter.h b/client/gui/ColorFilter.h index d30c21121..bfca82695 100644 --- a/client/gui/ColorFilter.h +++ b/client/gui/ColorFilter.h @@ -35,6 +35,7 @@ public: SDL_Color shiftColor(const SDL_Color & in) const; bool operator == (const ColorFilter & other) const; + bool operator != (const ColorFilter & other) const; /// Generates empty object that has no effect on image static ColorFilter genEmptyShifter();