From 40a9aefb5bacd2d5c5a6f357ec2d46fdc6c04718 Mon Sep 17 00:00:00 2001 From: David Markowitz <39972741+EmosewaMC@users.noreply.github.com> Date: Wed, 20 Jul 2022 20:26:52 -0700 Subject: [PATCH] Aggro radius (#665) --- dGame/dComponents/BaseCombatAIComponent.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dGame/dComponents/BaseCombatAIComponent.cpp b/dGame/dComponents/BaseCombatAIComponent.cpp index 4623e4dd..bfa000f2 100644 --- a/dGame/dComponents/BaseCombatAIComponent.cpp +++ b/dGame/dComponents/BaseCombatAIComponent.cpp @@ -65,9 +65,9 @@ BaseCombatAIComponent::BaseCombatAIComponent(Entity* parent, const uint32_t id) // radii if it is greater than the one in the database. if (m_Parent) { auto aggroRadius = m_Parent->GetVar(u"aggroRadius"); - m_AggroRadius = std::max(aggroRadius, m_AggroRadius); + m_AggroRadius = aggroRadius != 0 ? aggroRadius : m_AggroRadius; auto tetherRadius = m_Parent->GetVar(u"tetherRadius"); - m_HardTetherRadius = std::max(tetherRadius, m_HardTetherRadius); + m_HardTetherRadius = tetherRadius != 0 ? tetherRadius : m_HardTetherRadius; } /*