Merge branch 'develop' into FF/Fox2

Moose Development/Moose/Core/Point.lua

@@ -1217,11 +1217,11 @@ do -- COORDINATE
   -- @param #COORDINATE self
   -- @param #number Speed (optional) Speed in km/h. The default speed is 20 km/h.
   -- @param #string Formation (optional) The route point Formation, which is a text string that specifies exactly the Text in the Type of the route point, like "Vee", "Echelon Right".
+  -- @param #table DCSTasks A table of DCS tasks that are executed at the waypoints. Mind the curly brackets {}!
   -- @return #table The route point.
-  function COORDINATE:WaypointGround( Speed, Formation )
+  function COORDINATE:WaypointGround( Speed, Formation, DCSTasks )
     self:F2( { Formation, Speed } )
 
- 
     local RoutePoint = {}
     RoutePoint.x = self.x
     RoutePoint.y = self.z
@@ -1244,12 +1244,10 @@ do -- COORDINATE
     --      }, -- end of ["params"]
     --  }, -- end of ["task"]
 
-
     RoutePoint.task = {}
     RoutePoint.task.id = "ComboTask"
     RoutePoint.task.params = {}
-    RoutePoint.task.params.tasks = {}
-
+    RoutePoint.task.params.tasks = DCSTasks or {}
 
     return RoutePoint
   end

Moose Development/Moose/Core/Zone.lua

@@ -750,7 +750,7 @@ function ZONE_RADIUS:GetScannedUnits()
 end
 
 
---- Count the number of different coalitions inside the zone.
+--- Get a set of scanned units.
 -- @param #ZONE_RADIUS self
 -- @return Core.Set#SET_UNIT Set of units and statics inside the zone.
 function ZONE_RADIUS:GetScannedSetUnit()
@@ -949,7 +949,6 @@ function ZONE_RADIUS:SearchZone( EvaluateFunction, ObjectCategories )
 
   local function EvaluateZone( ZoneDCSUnit )
   
-    --env.info( ZoneDCSUnit:getName() ) 
   
     local ZoneUnit = UNIT:Find( ZoneDCSUnit )