Merge branch 'FF/Develop' into FF/Fox2

Moose Development/Moose/Functional/ATC_Ground.lua

@@ -1052,7 +1052,6 @@ end
 --    * `AIRBASE.Nevada.Laughlin_Airport`
 --    * `AIRBASE.Nevada.Lincoln_County`
 --    * `AIRBASE.Nevada.McCarran_International_Airport`
---    * `AIRBASE.Nevada.Mellan_Airstrip`
 --    * `AIRBASE.Nevada.Mesquite`
 --    * `AIRBASE.Nevada.Mina_Airport_3Q0`
 --    * `AIRBASE.Nevada.Nellis_AFB`
@@ -1096,8 +1095,7 @@ end
 --    
 --     -- Monitor specific airbases.
 --     ATC_Ground = ATC_GROUND_NEVADA:New(              
---       { AIRBASE.Nevada.Laughlin_Airport,             
---         AIRBASE.Nevada.Mellan_Airstrip,              
+--       { AIRBASE.Nevada.Laughlin_Airport,                        
 --         AIRBASE.Nevada.Lincoln_County,               
 --         AIRBASE.Nevada.North_Las_Vegas,              
 --         AIRBASE.Nevada.McCarran_International_Airport
@@ -2458,7 +2456,7 @@ end
 ATC_GROUND_PERSIANGULF = {
   ClassName = "ATC_GROUND_PERSIANGULF",
   Airbases = {
-    [AIRBASE.PersianGulf.Abu_Musa_Island_Airport] = {
+    [AIRBASE.PersianGulf.Al_Dhafra_AB] = { ---FIX by Wingthor Changed from Abu_Musa_Island_Airport
       PointsRunways = {
         [1] = {
           [1]={["y"]=-122813.71002344,["x"]=-31689.936027827,},

Moose Development/Moose/Functional/Range.lua

@@ -1088,7 +1088,7 @@ end
 -- @return #RANGE self
 function RANGE:SetSoundfilesPath(path)
   self.soundpath=tostring(path or "Range Soundfiles/")
-  self:I(self.lid..string.format("Setting sound files path to %s", self.soundpath))
+  self:I(self.id..string.format("Setting sound files path to %s", self.soundpath))
   return self
 end
 

Moose Development/Moose/Functional/Warehouse.lua

@@ -4920,8 +4920,14 @@ function WAREHOUSE:onafterChangeCountry(From, Event, To, Country)
   self.queue={}
 
   -- Airbase could have been captured before and already belongs to the new coalition.
-  local airbase=AIRBASE:FindByName(self.airbasename)
-  local airbasecoaltion=airbase:GetCoalition()
+  -- Check if Warehouse has a arbiase atthached
+  local airbasecoaltion
+  if self.airbase ~= nil then
+    local airbase=AIRBASE:FindByName(self.airbasename)
+    airbasecoaltion=airbase:GetCoalition() 
+  else -- Warehouse has no airbase attached so just keep whatever, self.airbase will still be nil since CoalitionNew will not be nil if Warehouse have a airbse attacjed.
+    airbasecoaltion = nil  
+  end
 
   if CoalitionNew==airbasecoaltion then
     -- Airbase already owned by the coalition that captured the warehouse. Airbase can be used by this warehouse.