Ticket #4278: ticket4278.patch

File ticket4278.patch, 1.2 KB (added by mimo, 8 years ago)

  • source/simulation2/components/CCmpUnitMotion.cpp

     
    15711571    goal.x = obstruction.x;
    15721572    goal.z = obstruction.z;
    15731573
    1574     entity_pos_t distance = Geometry::DistanceToSquare(pos - CFixedVector2D(obstruction.x, obstruction.z), obstruction.u, obstruction.v, halfSize);
     1574    entity_pos_t distance = Geometry::DistanceToSquare(pos - CFixedVector2D(obstruction.x, obstruction.z), obstruction.u, obstruction.v, halfSize, true);
    15751575
    15761576    // Compare with previous obstruction
    15771577    ICmpObstructionManager::ObstructionSquare previousObstruction;
    15781578    cmpObstruction->GetPreviousObstructionSquare(previousObstruction);
    1579     entity_pos_t previousDistance = Geometry::DistanceToSquare(pos - CFixedVector2D(previousObstruction.x, previousObstruction.z), obstruction.u, obstruction.v, halfSize);
     1579    entity_pos_t previousDistance = Geometry::DistanceToSquare(pos - CFixedVector2D(previousObstruction.x, previousObstruction.z), obstruction.u, obstruction.v, halfSize, true);
    15801580
    15811581    if (distance < minRange && previousDistance < minRange)
    15821582    {