Merge branch 'master' into develop

This commit is contained in:
Frank 2023-11-17 00:26:33 +01:00
commit 2a0086d3fe
2 changed files with 5 additions and 3 deletions

View File

@ -929,7 +929,7 @@ end
function AIRBASE:GetWarehouse()
local warehouse=nil --DCS#Warehouse
local airbase=self:GetDCSObject()
if airbase then
if airbase and Airbase.getWarehouse then
warehouse=airbase:getWarehouse()
end
return warehouse

View File

@ -168,8 +168,10 @@ function STORAGE:New(AirbaseName)
local self=BASE:Inherit(self, BASE:New()) -- #STORAGE
self.airbase=Airbase.getByName(AirbaseName)
self.warehouse=self.airbase:getWarehouse()
if Airbase.getWarehouse then
self.warehouse=self.airbase:getWarehouse()
end
self.lid = string.format("STORAGE %s", AirbaseName)