mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2025-10-29 16:58:06 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
823f8fb4fb
@ -1221,7 +1221,7 @@ CTLD.UnitTypes = {
|
|||||||
|
|
||||||
--- CTLD class version.
|
--- CTLD class version.
|
||||||
-- @field #string version
|
-- @field #string version
|
||||||
CTLD.version="1.0.38"
|
CTLD.version="1.0.39"
|
||||||
|
|
||||||
--- Instantiate a new CTLD.
|
--- Instantiate a new CTLD.
|
||||||
-- @param #CTLD self
|
-- @param #CTLD self
|
||||||
@ -1750,6 +1750,8 @@ function CTLD:_EventHandler(EventData)
|
|||||||
if _coalition ~= self.coalition then
|
if _coalition ~= self.coalition then
|
||||||
return --ignore!
|
return --ignore!
|
||||||
end
|
end
|
||||||
|
local unitname = event.IniUnitName or "none"
|
||||||
|
self.MenusDone[unitname] = nil
|
||||||
-- check is Helicopter
|
-- check is Helicopter
|
||||||
local _unit = event.IniUnit
|
local _unit = event.IniUnit
|
||||||
local _group = event.IniGroup
|
local _group = event.IniGroup
|
||||||
@ -1770,6 +1772,7 @@ function CTLD:_EventHandler(EventData)
|
|||||||
local unitname = event.IniUnitName or "none"
|
local unitname = event.IniUnitName or "none"
|
||||||
self.CtldUnits[unitname] = nil
|
self.CtldUnits[unitname] = nil
|
||||||
self.Loaded_Cargo[unitname] = nil
|
self.Loaded_Cargo[unitname] = nil
|
||||||
|
self.MenusDone[unitname] = nil
|
||||||
end
|
end
|
||||||
return self
|
return self
|
||||||
end
|
end
|
||||||
@ -3442,6 +3445,9 @@ function CTLD:_RefreshF10Menus()
|
|||||||
if _unit:IsHelicopter() or (self:IsHercules(_unit) and self.enableHercules) then --ensure no stupid unit entries here
|
if _unit:IsHelicopter() or (self:IsHercules(_unit) and self.enableHercules) then --ensure no stupid unit entries here
|
||||||
local unitName = _unit:GetName()
|
local unitName = _unit:GetName()
|
||||||
_UnitList[unitName] = unitName
|
_UnitList[unitName] = unitName
|
||||||
|
else
|
||||||
|
local unitName = _unit:GetName()
|
||||||
|
_UnitList[unitName] = nil
|
||||||
end
|
end
|
||||||
end -- end isAlive
|
end -- end isAlive
|
||||||
end -- end if _unit
|
end -- end if _unit
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user