From 123144d06ed76f822b5362832c730f66a7e7b9ef Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 8 Sep 2020 00:15:29 +0200 Subject: [PATCH] Ops temp --- Moose Development/Moose/Core/Timer.lua | 2 +- Moose Development/Moose/Ops/FlightGroup.lua | 11 +++++------ Moose Development/Moose/Ops/Squadron.lua | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Moose Development/Moose/Core/Timer.lua b/Moose Development/Moose/Core/Timer.lua index 9b8a9200b..8154bcc5a 100644 --- a/Moose Development/Moose/Core/Timer.lua +++ b/Moose Development/Moose/Core/Timer.lua @@ -206,7 +206,7 @@ function TIMER:Stop(Delay) if self.tid then -- Remove timer function. - self:T(self.lid..string.format("Stopping timer by removing timer function after %d calls!", self.ncalls)) + self:I(self.lid..string.format("Stopping timer by removing timer function after %d calls!", self.ncalls)) timer.removeFunction(self.tid) -- Remove DB entry. diff --git a/Moose Development/Moose/Ops/FlightGroup.lua b/Moose Development/Moose/Ops/FlightGroup.lua index 471751a36..8bb75be4f 100644 --- a/Moose Development/Moose/Ops/FlightGroup.lua +++ b/Moose Development/Moose/Ops/FlightGroup.lua @@ -2452,13 +2452,12 @@ function FLIGHTGROUP:onafterStop(From, Event, To) self:UnHandleEvent(EVENTS.Ejection) self:UnHandleEvent(EVENTS.Crash) self:UnHandleEvent(EVENTS.RemoveUnit) - - -- Remove flight from data base. - _DATABASE.FLIGHTGROUPS[self.groupname]=nil - - + -- Call OPSGROUP function. - self:GetParent(self).onafterStop(self, From, Event, To) + self:GetParent(self).onafterStop(self, From, Event, To) + + -- Remove flight from data base. + _DATABASE.FLIGHTGROUPS[self.groupname]=nil end ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- diff --git a/Moose Development/Moose/Ops/Squadron.lua b/Moose Development/Moose/Ops/Squadron.lua index d7a5ca114..a99891e2c 100644 --- a/Moose Development/Moose/Ops/Squadron.lua +++ b/Moose Development/Moose/Ops/Squadron.lua @@ -903,7 +903,7 @@ function SQUADRON:RecruitAssets(Mission, Npayloads) end -- Check if in a state where we really do not want to fight any more. - if flightgroup:IsLanding() or flightgroup:IsLanded() or flightgroup:IsArrived() or flightgroup:IsDead() then + if flightgroup:IsHolding() or flightgroup:IsLanding() or flightgroup:IsLanded() or flightgroup:IsArrived() or flightgroup:IsDead() or flightgroup:IsStopped() then combatready=false end