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/develop' into develop

Browse Source
This commit is contained in:
Applevangelist 2023-11-17 10:47:44 +01:00
commit f32784395c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Moose Development/Moose/Ops/OpsZone.lua
View File

@ -1025,7 +1025,7 @@ function OPSZONE:Scan()
if ZoneObject then if ZoneObject then
-- Object category. -- Object category.
local ObjectCategory=ZoneObject:getCategory() local ObjectCategory=Object.getCategory(ZoneObject)
if ObjectCategory==Object.Category.UNIT and ZoneObject:isExist() and ZoneObject:isActive() then if ObjectCategory==Object.Category.UNIT and ZoneObject:isExist() and ZoneObject:isActive() then

2
Moose Development/Moose/Ops/PlayerTask.lua
View File

@ -2951,7 +2951,7 @@ function PLAYERTASKCONTROLLER:_AddTask(Target)
task:HandleEvent(EVENTS.Shot) task:HandleEvent(EVENTS.Shot)
function task:OnEventShot(EventData) function task:OnEventShot(EventData)
local data = EventData -- Core.Event#EVENTDATA EventData local data = EventData -- Core.Event#EVENTDATA EventData
local wcat = data.Weapon:getCategory() -- cat 2 or 3 local wcat = Object.getCategory(data.Weapon) -- cat 2 or 3
local coord = data.IniUnit:GetCoordinate() or data.IniGroup:GetCoordinate() local coord = data.IniUnit:GetCoordinate() or data.IniGroup:GetCoordinate()
local vec2 = coord:GetVec2() or {x=0, y=0} local vec2 = coord:GetVec2() or {x=0, y=0}
local coal = data.IniCoalition local coal = data.IniCoalition