Revert "Merge branch 'develop' into FF/Develop"

This reverts commit 1f282693b3, reversing
changes made to e16f306e1d.

Moose Development/Moose/Core/Zone.lua

@@ -618,9 +618,6 @@ function ZONE_RADIUS:GetVec3( Height )
 end
 
 
-
-
-
 --- Scan the zone for the presence of units of the given ObjectCategories.
 -- Note that after a zone has been scanned, the zone can be evaluated by:
 -- 
@@ -632,11 +629,11 @@ end
 -- @{#ZONE_RADIUS.
 -- @param #ZONE_RADIUS self
 -- @param ObjectCategories
--- @param UnitCategories
+-- @param Coalition
 -- @usage
 --    self.Zone:Scan()
 --    local IsAttacked = self.Zone:IsSomeInZoneOfCoalition( self.Coalition )
-function ZONE_RADIUS:Scan( ObjectCategories, UnitCategories )
+function ZONE_RADIUS:Scan( ObjectCategories )
 
   self.ScanData = {}
   self.ScanData.Coalitions = {}
@@ -663,24 +660,9 @@ function ZONE_RADIUS:Scan( ObjectCategories, UnitCategories )
       if ( ObjectCategory == Object.Category.UNIT and ZoneObject:isExist() and ZoneObject:isActive() ) or 
          (ObjectCategory == Object.Category.STATIC and ZoneObject:isExist()) then
         local CoalitionDCSUnit = ZoneObject:getCoalition()
-        local Include = false
-        if not UnitCategories then
-          Include = true
-        else
-          local CategoryDCSUnit = ZoneObject:getDesc().category
-          for UnitCategoryID, UnitCategory in pairs( UnitCategories ) do
-            if UnitCategory == CategoryDCSUnit then
-              Include = true
-              break
-            end
-          end
-        end
-        if Include then
-          local CoalitionDCSUnit = ZoneObject:getCoalition()
-          self.ScanData.Coalitions[CoalitionDCSUnit] = true
-          self.ScanData.Units[ZoneObject] = ZoneObject
-          self:F2( { Name = ZoneObject:getName(), Coalition = CoalitionDCSUnit } )
-        end
+        self.ScanData.Coalitions[CoalitionDCSUnit] = true
+        self.ScanData.Units[ZoneObject] = ZoneObject
+        self:F2( { Name = ZoneObject:getName(), Coalition = CoalitionDCSUnit } )
       end
       if ObjectCategory == Object.Category.SCENERY then
         local SceneryType = ZoneObject:getTypeName()