weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-10 08:29:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'FF/Develop' into FF/Fox2

Browse Source
This commit is contained in:
Frank
2019-08-11 20:41:45 +02:00
parent 043e1dc74b c215255ae2
commit d1e4295178
10 changed files with 417 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Wrapper/Controllable.lua
+23 -1
View File
@@ -2805,9 +2805,31 @@ function CONTROLLABLE:GetDetectedTargets( DetectVisual, DetectOptical, DetectRad
local DetectionRWR = ( DetectRWR and DetectRWR == true ) and Controller.Detection.RWR or nil
local DetectionDLINK = ( DetectDLINK and DetectDLINK == true ) and Controller.Detection.DLINK or nil
local Params = {}
if DetectionVisual then
Params[#Params+1] = DetectionVisual
end
if DetectionOptical then
Params[#Params+1] = DetectionOptical
end
if DetectionRadar then
Params[#Params+1] = DetectionRadar
end
if DetectionIRST then
Params[#Params+1] = DetectionIRST
end
if DetectionRWR then
Params[#Params+1] = DetectionRWR
end
if DetectionDLINK then
Params[#Params+1] = DetectionDLINK
end
self:T2( { DetectionVisual, DetectionOptical, DetectionRadar, DetectionIRST, DetectionRWR, DetectionDLINK } )
return self:_GetController():getDetectedTargets( DetectionVisual, DetectionOptical, DetectionRadar, DetectionIRST, DetectionRWR, DetectionDLINK )
return self:_GetController():getDetectedTargets( Params[1], Params[2], Params[3], Params[4], Params[5], Params[6] )
end
return nil
Moose Development/Moose/Wrapper/Positionable.lua
+1 -1
View File
@@ -63,7 +63,7 @@ POSITIONABLE.__.Cargo = {}
-- @param #string PositionableName The POSITIONABLE name
-- @return #POSITIONABLE self
function POSITIONABLE:New( PositionableName )
local self = BASE:Inherit( self, IDENTIFIABLE:New( PositionableName ) )
local self = BASE:Inherit( self, IDENTIFIABLE:New( PositionableName ) ) -- #POSITIONABLE
self.PositionableName = PositionableName
return self