FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ops temp

Browse Source
This commit is contained in:
Frank 2020-09-08 00:15:29 +02:00
parent 38f5d45d5b
commit 123144d06e
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Moose Development/Moose/Core/Timer.lua
View File

@ -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.

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

@ -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
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

2
Moose Development/Moose/Ops/Squadron.lua
View File

@ -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