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

Update FlightGroup.lua

Browse Source
This commit is contained in:
Frank
2020-02-26 23:06:36 +01:00
parent 1dec76d96d
commit 8ed6f8b193
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Ops/FlightGroup.lua
+10 -6
View File
@@ -2658,7 +2658,7 @@ end
function FLIGHTGROUP:onafterTaskExecute(From, Event, To, Task) function FLIGHTGROUP:onafterTaskExecute(From, Event, To, Task)
-- Debug message. -- Debug message.
local text=string.format("Task %s ID=%d execute.", Task.description, Task.id) local text=string.format("Task %s ID=%d execute.", tostring(Task.description), Task.id)
MESSAGE:New(text, 10, "DEBUG"):ToAllIf(self.Debug) MESSAGE:New(text, 10, "DEBUG"):ToAllIf(self.Debug)
self:I(self.lid..text) self:I(self.lid..text)
@@ -2690,8 +2690,8 @@ function FLIGHTGROUP:onafterTaskExecute(From, Event, To, Task)
end end
-- Task done. -- Task done.
local TaskDone=self.group:TaskFunction("FLIGHTGROUP._TaskDone", self, Task) --local TaskDone=self.group:TaskFunction("FLIGHTGROUP._TaskDone", self, Task)
table.insert(DCStasks, TaskDone) --table.insert(DCStasks, TaskDone)
-- Combo task. -- Combo task.
local TaskCombo=self.group:TaskCombo(DCStasks) local TaskCombo=self.group:TaskCombo(DCStasks)
@@ -2701,9 +2701,13 @@ function FLIGHTGROUP:onafterTaskExecute(From, Event, To, Task)
-- Controlled task. -- Controlled task.
local TaskControlled=self.group:TaskControlled(TaskCombo, TaskCondition) local TaskControlled=self.group:TaskControlled(TaskCombo, TaskCondition)
-- Task done.
local TaskDone=self.group:TaskFunction("FLIGHTGROUP._TaskDone", self, Task)
local TaskFinal=self.group:TaskCombo({TaskControlled, TaskDone})
-- Set task for group. -- Set task for group.
self:SetTask(TaskControlled, 1) self:SetTask(TaskFinal, 1)
end end
@@ -2762,7 +2766,7 @@ function FLIGHTGROUP:onafterTaskCancel(From, Event, To)
task.stopflag:Set(1) task.stopflag:Set(1)
-- Call task done. -- Call task done.
self:TaskDone(task) --self:TaskDone(task)
else else
local text=string.format("WARNING: No current task to cancel!") local text=string.format("WARNING: No current task to cancel!")
MESSAGE:New(text, 10, "DEBUG"):ToAllIf(self.Debug) MESSAGE:New(text, 10, "DEBUG"):ToAllIf(self.Debug)
@@ -2857,7 +2861,7 @@ end
function FLIGHTGROUP:GetTask() function FLIGHTGROUP:GetTask()
if self.taskpaused then if self.taskpaused then
return self.taskpaused --return self.taskpaused
end end
if #self.taskqueue==0 then if #self.taskqueue==0 then