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

#FLIGHTGROUP

Browse Source 
* Resolve a stalemate when all jobs are done but _CheckGroupDone isn't called any longer
This commit is contained in:
Applevangelist 2023-11-06 18:36:02 +01:00
parent 6db2e333ad
commit eed6119193
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Moose Development/Moose/Ops/FlightGroup.lua
View File

@ -216,7 +216,7 @@ FLIGHTGROUP.Players={}
--- FLIGHTGROUP class version. --- FLIGHTGROUP class version.
-- @field #string version -- @field #string version
FLIGHTGROUP.version="1.0.1" FLIGHTGROUP.version="1.0.2"
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO list -- TODO list
@ -1257,20 +1257,20 @@ function FLIGHTGROUP:Status()
-- Check damage. -- Check damage.
self:_CheckDamage() self:_CheckDamage()
-- Get current mission (if any).
local mission=self:GetMissionCurrent()
-- TODO: Check if group is waiting? -- TODO: Check if group is waiting?
if self:IsWaiting() then if self:IsWaiting() then
if self.Twaiting and self.dTwait then if self.Twaiting and self.dTwait then
if timer.getAbsTime()>self.Twaiting+self.dTwait then if timer.getAbsTime()>self.Twaiting+self.dTwait then
--self.Twaiting=nil --self.Twaiting=nil
--self.dTwait=nil --self.dTwait=nil
--self:Cruise() --self:_CheckGroupDone()
end end
end end
end end
-- Get current mission (if any).
local mission=self:GetMissionCurrent()
-- If mission, check if DCS task needs to be updated. -- If mission, check if DCS task needs to be updated.
if mission and mission.updateDCSTask then if mission and mission.updateDCSTask then
@ -1618,8 +1618,14 @@ function FLIGHTGROUP:Status()
self:_PrintTaskAndMissionStatus() self:_PrintTaskAndMissionStatus()
-- Current mission. -- All done?
-- Get current mission (if any).
local mission=self:GetMissionCurrent() local mission=self:GetMissionCurrent()
if not mission then
self.Twaiting=nil
self.dTwait=nil
self:_CheckGroupDone()
end
end end