Merge branch 'master' into develop

This commit is contained in:
Frank 2023-07-26 17:23:34 +02:00
commit 3c74aef378

View File

@ -5924,9 +5924,11 @@ function AIRBOSS:_ScanCarrierZone()
-- Get aircraft type name.
local actype = group:GetTypeName()
-- Create a new flight group
if knownflight then
-- Debug output.
self:T2(self.lid..string.format("Known flight group %s of type %s in CCA.", groupname, actype))
-- Check if flight is AI and if we want to handle it at all.
if knownflight.ai and knownflight.flag == -100 and self.handleai then
@ -5943,9 +5945,10 @@ function AIRBOSS:_ScanCarrierZone()
flight.airboss = self
end
-- Send AI flight to marshal stack.
-- Send AI flight to marshal stack if group closes in more than 5 and has initial flag value.
if putintomarshal then
-- Get the next free stack for current recovery case.
local stack = self:_GetFreeStack( knownflight.ai )