weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-18 13:16:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

FG

Browse Source 
- SetTask --> PushTask to keep enroute tasks alive.
This commit is contained in:
Frank
2020-03-01 23:55:15 +01:00
parent 905095add9
commit dc3350a1c8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Functional/Warehouse.lua
+1 -1
View File
@@ -3981,7 +3981,7 @@ end
-- @param #WAREHOUSE.Assetitem asset The asset that has just been added. -- @param #WAREHOUSE.Assetitem asset The asset that has just been added.
-- @param #string assignment The (optional) assignment for the asset. -- @param #string assignment The (optional) assignment for the asset.
function WAREHOUSE:onafterNewAsset(From, Event, To, asset, assignment) function WAREHOUSE:onafterNewAsset(From, Event, To, asset, assignment)
self:I(self.lid..string.format("New asset %s id=%d with assignment %s.", tostring(asset.templatename), asset.uid, tostring(assignment))) self:T(self.lid..string.format("New asset %s id=%d with assignment %s.", tostring(asset.templatename), asset.uid, tostring(assignment)))
end end
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Moose Development/Moose/Ops/FlightGroup.lua
+2 -2
View File
@@ -2354,7 +2354,7 @@ function FLIGHTGROUP:onafterPassingWaypoint(From, Event, To, n, N)
-- Execute waypoint tasks. -- Execute waypoint tasks.
if #taskswp>0 then if #taskswp>0 then
self:SetTask(self.group:TaskCombo(taskswp)) self:PushTask(self.group:TaskCombo(taskswp))
end end
end end
@@ -2954,7 +2954,7 @@ function FLIGHTGROUP:onafterTaskExecute(From, Event, To, Task)
local TaskFinal=self.group:TaskCombo({TaskControlled, TaskDone}) local TaskFinal=self.group:TaskCombo({TaskControlled, TaskDone})
-- Set task for group. -- Set task for group.
self:SetTask(TaskFinal, 1) self:PushTask(TaskFinal, 1)
end end