Ticket #4278: ticket4278-v2.patch

source/simulation2/components/CCmpUnitMotion.cpp

@@ -1571 +1571 @@
     goal.x = obstruction.x;
     goal.z = obstruction.z;
 
-    entity_pos_t distance = Geometry::DistanceToSquare(pos - CFixedVector2D(obstruction.x, obstruction.z), obstruction.u, obstruction.v, halfSize);
+    entity_pos_t distance = Geometry::DistanceToSquare(pos - CFixedVector2D(obstruction.x, obstruction.z), obstruction.u, obstruction.v, halfSize, true);
 
     // Compare with previous obstruction 
     ICmpObstructionManager::ObstructionSquare previousObstruction;
     cmpObstruction->GetPreviousObstructionSquare(previousObstruction);
-    entity_pos_t previousDistance = Geometry::DistanceToSquare(pos - CFixedVector2D(previousObstruction.x, previousObstruction.z), obstruction.u, obstruction.v, halfSize);
+    entity_pos_t previousDistance = Geometry::DistanceToSquare(pos - CFixedVector2D(previousObstruction.x, previousObstruction.z), obstruction.u, obstruction.v, halfSize, true);
 
-    if (distance < minRange && previousDistance < minRange)
+    bool inside = distance.IsZero() && !Geometry::DistanceToSquare(pos - CFixedVector2D(obstruction.x, obstruction.z), obstruction.u, obstruction.v, halfSize).IsZero(); 
+    if (distance < minRange && previousDistance < minRange || inside)
     {
         // Too close to the square - need to move away
 
@@ -1691 +1692 @@
     if (hasObstruction)
     {
         CFixedVector2D halfSize(obstruction.hw, obstruction.hh);
-        entity_pos_t distance = Geometry::DistanceToSquare(pos - CFixedVector2D(obstruction.x, obstruction.z), obstruction.u, obstruction.v, halfSize);
+        entity_pos_t distance = Geometry::DistanceToSquare(pos - CFixedVector2D(obstruction.x, obstruction.z), obstruction.u, obstruction.v, halfSize, true);
 
         // Compare with previous obstruction
         ICmpObstructionManager::ObstructionSquare previousObstruction;
         cmpObstruction->GetPreviousObstructionSquare(previousObstruction);
-        entity_pos_t previousDistance = Geometry::DistanceToSquare(pos - CFixedVector2D(previousObstruction.x, previousObstruction.z), obstruction.u, obstruction.v, halfSize);
+        entity_pos_t previousDistance = Geometry::DistanceToSquare(pos - CFixedVector2D(previousObstruction.x, previousObstruction.z), obstruction.u, obstruction.v, halfSize, true);
 
         // See if we're too close to the target square
-        if (distance < minRange && previousDistance < minRange)
+        bool inside = distance.IsZero() && !Geometry::DistanceToSquare(pos - CFixedVector2D(obstruction.x, obstruction.z), obstruction.u, obstruction.v, halfSize).IsZero();
+        if (distance < minRange && previousDistance < minRange || inside)
             return false;
 
         // See if we're close enough to the target square