From ee620856ad2918ae7ce91a37a980d9f2129a074a Mon Sep 17 00:00:00 2001 From: NoName <322016+Faq@users.noreply.github.com> Date: Tue, 8 Sep 2020 18:12:52 +0300 Subject: Core/Movement: Corrected Animation Tier handling (PR #24875) Co-authored-by: Warpten Co-authored-by: Ovahlord Co-authored-by: Carbenium (cherry picked from commit dad187615df603ad8614531a0ec84c1a5e136838) --- src/server/game/AI/SmartScripts/SmartScript.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/server/game/AI/SmartScripts') diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index e613b418bfb..f4843715a33 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -1888,9 +1888,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u target->ToUnit()->AddVisFlags(UnitVisFlags(e.action.setunitByte.byte1)); break; case 3: - // this is totally wrong to maintain compatibility with existing scripts - // TODO: fix with animtier overhaul - target->ToUnit()->SetAnimTier(UnitBytes1_Flags(target->ToUnit()->m_unitData->AnimTier | e.action.setunitByte.byte1), false); + target->ToUnit()->SetAnimTier(AnimTier(e.action.setunitByte.byte1)); break; } } @@ -1913,7 +1911,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u target->ToUnit()->RemoveVisFlags(UnitVisFlags(e.action.setunitByte.byte1)); break; case 3: - target->ToUnit()->SetAnimTier(UnitBytes1_Flags(target->ToUnit()->m_unitData->AnimTier & ~e.action.setunitByte.byte1), false); + target->ToUnit()->SetAnimTier(AnimTier::Ground); break; } } -- cgit v1.2.3