mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2025-10-29 16:58:06 +00:00
Merge branch 'master' into develop
# Conflicts: # Moose Development/Moose/Core/Set.lua
This commit is contained in:
commit
2e386be2f6
@ -7845,17 +7845,16 @@ do -- SET_OPSGROUP
|
|||||||
|
|
||||||
if Event.IniDCSUnit and Event.IniDCSGroup then
|
if Event.IniDCSUnit and Event.IniDCSGroup then
|
||||||
local DCSgroup=Event.IniDCSGroup --DCS#Group
|
local DCSgroup=Event.IniDCSGroup --DCS#Group
|
||||||
|
|
||||||
if DCSgroup:getInitialSize() == DCSgroup:getSize() then -- This seems to be not a good check as even for the first birth event, getSize returns the total number of units in the group.
|
if DCSgroup:getInitialSize() == DCSgroup:getSize() then -- This seems to be not a good check as even for the first birth event, getSize returns the total number of units in the group.
|
||||||
|
|
||||||
local groupname, group = self:AddInDatabase( Event )
|
local groupname, group = self:AddInDatabase( Event )
|
||||||
|
|
||||||
if group and group:CountAliveUnits()==DCSgroup:getInitialSize() then
|
if group and group:CountAliveUnits()==DCSgroup:getInitialSize() then
|
||||||
if group and self:IsIncludeObject( group ) then
|
if group and self:IsIncludeObject( group ) then
|
||||||
self:Add( groupname, group )
|
self:Add( groupname, group )
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user