Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Applevangelist 2024-08-12 19:06:01 +02:00
commit e2fa1f992b

View File

@ -547,20 +547,22 @@ function GROUP:GetCategoryName()
return nil return nil
end end
--- Returns the coalition of the DCS Group. --- Returns the coalition of the DCS Group.
-- @param #GROUP self -- @param #GROUP self
-- @return DCS#coalition.side The coalition side of the DCS Group. -- @return DCS#coalition.side The coalition side of the DCS Group.
function GROUP:GetCoalition() function GROUP:GetCoalition()
self:F2( self.GroupName ) --self:F2( self.GroupName )
if self.GroupCoalition ~= nil then
return self.GroupCoalition
else
local DCSGroup = self:GetDCSObject() local DCSGroup = self:GetDCSObject()
if DCSGroup then if DCSGroup then
local GroupCoalition = DCSGroup:getCoalition() local GroupCoalition = DCSGroup:getCoalition()
self:T3( GroupCoalition ) --self:T3( GroupCoalition )
self.GroupCoalition = GroupCoalition
return GroupCoalition return GroupCoalition
end end
end
return nil return nil
end end