aboutsummaryrefslogtreecommitdiff
path: root/src/game/CreatureGroups.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/CreatureGroups.cpp')
-rw-r--r--src/game/CreatureGroups.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/game/CreatureGroups.cpp b/src/game/CreatureGroups.cpp
index 45e1c7ee11c..56549da77d7 100644
--- a/src/game/CreatureGroups.cpp
+++ b/src/game/CreatureGroups.cpp
@@ -118,6 +118,11 @@ void CreatureGroupManager::LoadCreatureFormations()
group_member->follow_dist = fields[2].GetFloat();
group_member->follow_angle = fields[3].GetFloat() * M_PI / 180;
}
+ else
+ {
+ group_member->follow_dist = 0;
+ group_member->follow_angle = 0;
+ }
// check data correctness
{
@@ -241,7 +246,7 @@ void CreatureGroup::LeaderMoveTo(float x, float y, float z)
member->UpdateGroundPositionZ(dx, dy, dz);
- if(member->GetDistance(m_leader) < dist + MAX_DESYNC)
+ if(member->IsWithinDist(m_leader, dist + MAX_DESYNC))
member->SetUnitMovementFlags(m_leader->GetUnitMovementFlags());
else
member->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);