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 remote-tracking branch 'origin/master' into develop

Browse Source 
# Conflicts:
#	Moose Development/Moose/Wrapper/Object.lua
This commit is contained in:
Applevangelist
2023-11-17 10:47:40 +01:00
parent 0bb95ef5a3 0bc52eb331
commit 7d71b4f955
10 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Moose Development/Moose/Functional/Sead.lua
View File

@@ -484,7 +484,7 @@ function SEAD:HandleEventShot( EventData )
end
return self
end
local targetcat = _target:getCategory() -- Identify category
local targetcat = Object.getCategory(_target) -- Identify category
local _targetUnit = nil -- Wrapper.Unit#UNIT
local _targetgroup = nil -- Wrapper.Group#GROUP
self:T(string.format("*** Targetcat = %d",targetcat))

2
Moose Development/Moose/Functional/Shorad.lua
View File

@@ -673,7 +673,7 @@ do
return self
end
local targetcat = targetdata:getCategory() -- Identify category
local targetcat = Object.getCategory(targetdata) -- Identify category
self:T(string.format("Target Category (3=STATIC, 1=UNIT)= %s",tostring(targetcat)))
self:T({targetdata})
local targetunit = nil