From 1c1f74e1ade32b85f53958a96c27edf458a3c3e4 Mon Sep 17 00:00:00 2001
From: Frank <frank@inter-zone.de>
Date: Wed, 22 Jan 2020 00:23:18 +0100
Subject: [PATCH] FG/FC

---
 Moose Development/Moose/Ops/FlightControl.lua |  3 ++-
 Moose Development/Moose/Ops/FlightGroup.lua   | 13 +++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Moose Development/Moose/Ops/FlightControl.lua b/Moose Development/Moose/Ops/FlightControl.lua
index 9a84d5cb3..d67c8b89d 100644
--- a/Moose Development/Moose/Ops/FlightControl.lua	
+++ b/Moose Development/Moose/Ops/FlightControl.lua	
@@ -1244,6 +1244,7 @@ function FLIGHTCONTROL:_PlayerRequestTakeoff(groupname)
       self:_AddFlightToTakeoffQueue(flight)
     
     else
+      MESSAGE:New(string.format("You must request TAXI before you can request TAKEOFF!"), 5):ToAll()  
     end
   end
   
@@ -1282,7 +1283,7 @@ function FLIGHTCONTROL:_CreateFlightGroup(group)
   end
     
   -- Add to known flights.
-  table.insert(self.flights, flight)
+  --table.insert(self.flights, flight)
     
   return flight
 end
diff --git a/Moose Development/Moose/Ops/FlightGroup.lua b/Moose Development/Moose/Ops/FlightGroup.lua
index 9971e3543..c31cb4df9 100644
--- a/Moose Development/Moose/Ops/FlightGroup.lua	
+++ b/Moose Development/Moose/Ops/FlightGroup.lua	
@@ -525,18 +525,23 @@ end
 -- @return #FLIGHTGROUP self
 function FLIGHTGROUP:SetFlightControl(flightcontrol)
   self:I(self.sid..string.format("Setting FLIGHTCONTROL to airbase %s", flightcontrol.airbasename))
+  
   -- Remove flight from previous FC.
   if self.flightcontrol and self.flightcontrol.airbasename~=flightcontrol.airbasename then
     self.flightcontrol:_RemoveFlight(self)
   end
+  
   -- Set FC.
   self.flightcontrol=flightcontrol
+  
   -- Add flight to all flights.
   table.insert(flightcontrol.flights, self)
+  
   -- Update flight's F10 menu.
   if self.ai==false then
     self:_UpdateMenu()
   end
+  
   return self
 end
 
@@ -1540,14 +1545,14 @@ function FLIGHTGROUP:onbeforeUpdateRoute(From, Event, To, n)
 
   if self.group and self.group:IsAlive() and self:IsAirborne() then
     -- Alive & Airborne ==> Update route possible.
-    self:I(self.sid.."FF update route allowed")
+    self:T2(self.sid.."Update route allowed")
     return true
   elseif self:IsDead() then
     -- Group is dead! No more updates.
     return false
   else
     -- Not airborne yet. Try again in 1 sec.
-    self:I(self.sid.."FF update route denied ==> checking back in 1 sec")
+    self:T3(self.sid.."FF update route denied ==> checking back in 1 sec")
     self:__UpdateRoute(-1, n)
     return false
   end
@@ -1563,7 +1568,7 @@ end
 function FLIGHTGROUP:onafterUpdateRoute(From, Event, To, n)
 
   MESSAGE:New("Updating route", 10):ToAll()
-  self:I(self.sid.."FF updating route")
+  self:I(self.sid.."Updating route")
 
   -- TODO: what happens if currentwp=#waypoints
   n=n or self.currentwp+1
@@ -2219,7 +2224,7 @@ function FLIGHTGROUP._ReachedHolding(group, flightgroup)
   -- Add flight to waiting/holding queue.
   if flightgroup.flightcontrol then
     -- Add flight to all flights.
-    table.insert(flightgroup.flightcontrol.flights, flightgroup)
+    --table.insert(flightgroup.flightcontrol.flights, flightgroup)
     flightgroup.flightcontrol:_AddFlightToHoldingQueue(flightgroup)
   end
 end