FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #826 from FlightControl-Master/FF-Servant

Browse Source 
RAT v2.2
This commit is contained in:
Frank
2018-03-11 13:29:05 +01:00
committed by GitHub
parent 3544f07169 f2cb750aa2
commit 309ba285b1
2 changed files with 1006 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Moose Development/Moose/Core/Zone.lua
View File

@@ -618,10 +618,11 @@ function ZONE_RADIUS:Scan( ObjectCategories )
} }
local function EvaluateZone( ZoneObject ) local function EvaluateZone( ZoneObject )
if ZoneObject:isExist() then --if ZoneObject:isExist() then --FF: isExist always returns false for SCENERY objects since DCS 2.2 and still in DCS 2.5
if ZoneObject then
local ObjectCategory = ZoneObject:getCategory() local ObjectCategory = ZoneObject:getCategory()
if ( ObjectCategory == Object.Category.UNIT and ZoneObject:isActive() ) or if ( ObjectCategory == Object.Category.UNIT and ZoneObject:isExist() and ZoneObject:isActive() ) or
ObjectCategory == Object.Category.STATIC then (ObjectCategory == Object.Category.STATIC and ZoneObject:isExist()) then
local CoalitionDCSUnit = ZoneObject:getCoalition() local CoalitionDCSUnit = ZoneObject:getCoalition()
self.ScanData.Coalitions[CoalitionDCSUnit] = true self.ScanData.Coalitions[CoalitionDCSUnit] = true
self:E( { Name = ZoneObject:getName(), Coalition = CoalitionDCSUnit } ) self:E( { Name = ZoneObject:getName(), Coalition = CoalitionDCSUnit } )

1221
Moose Development/Moose/Functional/RAT.lua
View File

File diff suppressed because it is too large Load Diff