Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/Course.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1586,7 +1586,7 @@ function Course.createFromXml(vehicle, courseXml, courseKey)
course.nVehicles = courseXml:getValue(courseKey .. '#nVehicles', 1)
course.headlandClockwise = courseXml:getValue(courseKey .. '#headlandClockwise')
course.islandHeadlandClockwise = courseXml:getValue(courseKey .. '#islandHeadlandClockwise')
course.editedByCourseEditor = courseXml:getValue(courseKey .. '#compacted', false)
course.editedByCourseEditor = courseXml:getValue(courseKey .. '#wasEdited', false)
course.compacted = courseXml:getValue(courseKey .. '#compacted', false)
if course.nVehicles == 1 then
-- for multi-vehicle courses, we load the multi-vehicle data and restore the current course
Expand Down
5 changes: 3 additions & 2 deletions scripts/ai/strategies/AIDriveStrategyCombineCourse.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2210,8 +2210,9 @@ function AIDriveStrategyCombineCourse:startFieldBoundaryDetection()
-- in some rare cases, for instance when using field margin, the start waypoint may be outside
-- of the field, and thus the detection won't work.
local x, _, z = self.fieldWorkCourse:getWaypointPosition(self.fieldWorkCourse:getCurrentWaypointIx())
-- no callback, waitForFieldBoundary() will take care of the result
self.vehicle:cpDetectFieldBoundary(x, z)
self.vehicle:cpDetectFieldBoundary(x, z, self, function(self)
self:clearInfoText(InfoTextManager.WAITING_FOR_FIELD_BOUNDARY_DETECTION)
end)
else
self:debug("Field boundary detection already running.")
end
Expand Down
Loading