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

This commit is contained in:
Applevangelist 2024-12-15 11:34:08 +01:00
commit 90c78f304c

View File

@ -999,11 +999,11 @@ function AIRBASE:Register(AirbaseName)
--end --end
-- Set category. -- Set category.
if self.category==Airbase.Category.AIRDROME then if self.category==Airbase.Category.AIRDROME then
self.isAirdrome=true self.isAirdrome=true
elseif self.category==Airbase.Category.HELIPAD then elseif self.category==Airbase.Category.HELIPAD or self.descriptors.typeName=="FARP_SINGLE_01" then
self.isHelipad=true self.isHelipad=true
elseif self.category==Airbase.Category.SHIP then elseif self.category==Airbase.Category.SHIP then
self.isShip=true self.isShip=true
-- DCS bug: Oil rigs and gas platforms have category=2 (ship). Also they cannot be retrieved by coalition.getStaticObjects() -- DCS bug: Oil rigs and gas platforms have category=2 (ship). Also they cannot be retrieved by coalition.getStaticObjects()
if self.descriptors.typeName=="Oil rig" or self.descriptors.typeName=="Ga" then if self.descriptors.typeName=="Oil rig" or self.descriptors.typeName=="Ga" then
@ -1012,9 +1012,9 @@ function AIRBASE:Register(AirbaseName)
self.category=Airbase.Category.HELIPAD self.category=Airbase.Category.HELIPAD
_DATABASE:AddStatic(AirbaseName) _DATABASE:AddStatic(AirbaseName)
end end
else else
self:E("ERROR: Unknown airbase category!") self:E("ERROR: Unknown airbase category!")
end end
-- Init Runways. -- Init Runways.
self:_InitRunways() self:_InitRunways()