Ticket #4473: worksonfirstsight.patch

source/simulation2/components/CCmpUnitMotion.cpp

@@ -658 +658 @@
     /**
      * Returns an appropriate obstruction filter for use with path requests.
      * noTarget is true only when used inside tryGoingStraightToTargetEntity,
      * in which case we do not want the target obstruction otherwise it would always fail
      */
-    ControlGroupMovementObstructionFilter GetObstructionFilter(bool noTarget = false) const;
+    ControlGroupMovementObstructionFilter GetObstructionFilter() const;
 
     /**
      * Start moving to the given goal, from our current position 'from'.
      * Might go in a straight line immediately, or might start an asynchronous
      * path request.
@@ -1137 +1137 @@
 
     // Find the point on the goal shape that we should head towards
     CFixedVector2D goalPos = goal.NearestPointOnGoal(from);
 
     // Check if there's any collisions on that route
-    if (!cmpPathfinder->CheckMovement(GetObstructionFilter(true), from.X, from.Y, goalPos.X, goalPos.Y, m_Clearance, m_PassClass))
+    if (!cmpPathfinder->CheckMovement(GetObstructionFilter(), from.X, from.Y, goalPos.X, goalPos.Y, m_Clearance, m_PassClass))
         return false;
 
     // That route is okay, so update our path
     m_FinalGoal = goal;
     m_LongPath.m_Waypoints.clear();
@@ -1271 +1271 @@
             return;
         cmpPosition->TurnTo(angle);
     }
 }
 
-ControlGroupMovementObstructionFilter CCmpUnitMotion::GetObstructionFilter(bool noTarget) const
+ControlGroupMovementObstructionFilter CCmpUnitMotion::GetObstructionFilter() const
 {
-    entity_id_t group = noTarget ? m_TargetEntity : GetGroup();
-    return ControlGroupMovementObstructionFilter(ShouldAvoidMovingUnits(), group);
+    return ControlGroupMovementObstructionFilter(ShouldAvoidMovingUnits(), GetGroup());
 }
 
 
 
 void CCmpUnitMotion::BeginPathing(const CFixedVector2D& from, const PathGoal& goal)