Merge branch 'FF/Ops' into FF/OpsDev

Moose Development/Moose/Ops/FlightGroup.lua

@@ -44,7 +44,7 @@
 -- @field #boolean fuelcritical Fuel critical switch.
 -- @field #number fuelcriticalthresh Critical fuel threshold in percent.
 -- @field #boolean fuelcriticalrtb RTB on critical fuel switch.
--- @field Ops.FlightControl#FLIGHTCONTROL flightcontrol The flightcontrol handling this group.
+-- @field OPS.FlightControl#FLIGHTCONTROL flightcontrol The flightcontrol handling this group.
 -- @field Ops.Airboss#AIRBOSS airboss The airboss handling this group.
 -- @field Core.UserFlag#USERFLAG flaghold Flag for holding.
 -- @field #number Tholding Abs. mission time stamp when the group reached the holding point.
@@ -54,7 +54,7 @@
 -- @field #boolean despawnAfterLanding If `true`, group is despawned after landed at an airbase.
 -- @field #boolean despawnAfterHolding If `true`, group is despawned after reaching the holding point.
 -- @field #number RTBRecallCount Number that counts RTB calls.
--- @field Ops.FlightControl#FLIGHTCONTROL.HoldingStack stack Holding stack.
+-- @field OPS.FlightControl#FLIGHTCONTROL.HoldingStack stack Holding stack.
 -- @field #boolean isReadyTO Flight is ready for takeoff. This is for FLIGHTCONTROL.
 -- @field #boolean prohibitAB Disallow (true) or allow (false) AI to use the afterburner.
 -- @field #boolean jettisonEmptyTanks Allow (true) or disallow (false) AI to jettison empty fuel tanks.
@@ -699,7 +699,7 @@ end
 
 --- Get airwing the flight group belongs to.
 -- @param #FLIGHTGROUP self
--- @return Ops.AirWing#AIRWING The AIRWING object (if any).
+-- @return Ops.Airwing#AIRWING The AIRWING object (if any).
 function FLIGHTGROUP:GetAirwing()
   return self.legion
 end
@@ -797,7 +797,7 @@ end
 
 --- Set the FLIGHTCONTROL controlling this flight group.
 -- @param #FLIGHTGROUP self
--- @param Ops.FlightControl#FLIGHTCONTROL flightcontrol The FLIGHTCONTROL object.
+-- @param OPS.FlightControl#FLIGHTCONTROL flightcontrol The FLIGHTCONTROL object.
 -- @return #FLIGHTGROUP self
 function FLIGHTGROUP:SetFlightControl(flightcontrol)
 
@@ -826,7 +826,7 @@ end
 
 --- Get the FLIGHTCONTROL controlling this flight group.
 -- @param #FLIGHTGROUP self
--- @return Ops.FlightControl#FLIGHTCONTROL The FLIGHTCONTROL object.
+-- @return OPS.FlightControl#FLIGHTCONTROL The FLIGHTCONTROL object.
 function FLIGHTGROUP:GetFlightControl()
   return self.flightcontrol
 end
@@ -2359,10 +2359,10 @@ function FLIGHTGROUP:onafterCruise(From, Event, To)
     ---
     -- CLIENT
     ---
-  
+
     -- Had this commented out (forgot why, probably because it was not necessary) but re-enabling it because of carrier launch.
     self:_UpdateMenu(0.1)
-    
+
   end
 
 end
@@ -2892,7 +2892,7 @@ function FLIGHTGROUP:_CheckGroupDone(delay, waittime)
 
           else
             -- Check if not parking (could be on ALERT5 and just spawned (current mission=nil)
-            if not self:IsParking() then            
+            if not self:IsParking() then
               self:T(self.lid..string.format("Passed Final WP but Tasks=%d or Missions=%d left in the queue. Wait!", nTasks, nMissions))
               self:__Wait(-1)
             end
@@ -3266,14 +3266,14 @@ function FLIGHTGROUP:_LandAtAirbase(airbase, SpeedTo, SpeedHold, SpeedLand)
       local wind = airbase:GetCoordinate():GetWind()
       rheading = -wind
     end
-    
+
     local papp=airbase:GetCoordinate():Translate(x1, rheading):SetAltitude(h1)
     wp[#wp+1]=papp:WaypointAirTurningPoint("BARO", UTILS.KnotsToKmph(SpeedLand), {TaskFinal}, "Final Approach")
 
     -- Okay, it looks like it's best to specify the coordinates not at the airbase but a bit away. This causes a more direct landing approach.
     local pland=airbase:GetCoordinate():Translate(x2, rheading):SetAltitude(h2)
     wp[#wp+1]=pland:WaypointAirLanding(UTILS.KnotsToKmph(SpeedLand), airbase, {}, "Landing")
-      
+
   elseif airbase:IsShip() or airbase:IsHelipad() then
 
     ---
@@ -3882,10 +3882,11 @@ function FLIGHTGROUP:_InitGroup(Template)
   self.speedMax=group:GetSpeedMax()
 
   -- Is group mobile?
-  if self.speedMax>3.6 then
+  if self.speedMax and self.speedMax>3.6 then
     self.isMobile=true
   else
     self.isMobile=false
+    self.speedMax = 0
   end
 
   -- Cruise speed limit 380 kts for fixed and 110 knots for rotary wings.
@@ -4956,7 +4957,7 @@ function FLIGHTGROUP:_UpdateMenu(delay)
       -- Get all FLIGHTCONTROLS
       local fc={}
       for airbasename,_flightcontrol in pairs(_DATABASE.FLIGHTCONTROLS) do
-        local flightcontrol=_flightcontrol --Ops.FlightControl#FLIGHTCONTROL
+        local flightcontrol=_flightcontrol --OPS.FlightControl#FLIGHTCONTROL
 
         -- Get coord of airbase.
         local coord=flightcontrol:GetCoordinate()