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

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

Browse Source 
# Conflicts:
#	Moose Development/Moose/Wrapper/Airbase.lua
This commit is contained in:
Applevangelist 2023-06-02 08:46:48 +02:00
commit 00ecbc98ba
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Moose Development/Moose/Wrapper/Airbase.lua
View File

@ -2309,5 +2309,3 @@ end
function AIRBASE:GetCategoryName() function AIRBASE:GetCategoryName()
return AIRBASE.CategoryName[self.category] return AIRBASE.CategoryName[self.category]
end end

7
Moose Development/Moose/Wrapper/Unit.lua
View File

@ -25,6 +25,7 @@
-- @field #string ClassName Name of the class. -- @field #string ClassName Name of the class.
-- @field #string UnitName Name of the unit. -- @field #string UnitName Name of the unit.
-- @field #string GroupName Name of the group the unit belongs to. -- @field #string GroupName Name of the group the unit belongs to.
-- @field #table DCSUnit The DCS Unit object from the API.
-- @extends Wrapper.Controllable#CONTROLLABLE -- @extends Wrapper.Controllable#CONTROLLABLE
--- For each DCS Unit object alive within a running mission, a UNIT wrapper object (instance) will be created within the global _DATABASE object (an instance of @{Core.Database#DATABASE}). --- For each DCS Unit object alive within a running mission, a UNIT wrapper object (instance) will be created within the global _DATABASE object (an instance of @{Core.Database#DATABASE}).
@ -92,6 +93,7 @@ UNIT = {
ClassName="UNIT", ClassName="UNIT",
UnitName=nil, UnitName=nil,
GroupName=nil, GroupName=nil,
DCSUnit = nil,
} }
@ -124,6 +126,7 @@ function UNIT:Register( UnitName )
if group then if group then
self.GroupName=group:getName() self.GroupName=group:getName()
end end
self.DCSUnit = unit
end end
-- Set event prio. -- Set event prio.
@ -176,6 +179,10 @@ function UNIT:GetDCSObject()
return DCSUnit return DCSUnit
end end
if self.DCSUnit then
return self.DCSUnit
end
return nil return nil
end end