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-06-07 17:25:49 +02:00
commit 910da86caf
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1616,7 +1616,11 @@ function ZONE_UNIT:New( ZoneName, ZoneUNIT, Radius, Offset)
if (Offset.dx or Offset.dy) and (Offset.rho or Offset.theta) then if (Offset.dx or Offset.dy) and (Offset.rho or Offset.theta) then
error("Cannot use (dx, dy) with (rho, theta)") error("Cannot use (dx, dy) with (rho, theta)")
end end
end
local self = BASE:Inherit( self, ZONE_RADIUS:New( ZoneName, ZoneUNIT:GetVec2(), Radius, true ) )
if Offset then
self.dy = Offset.dy or 0.0 self.dy = Offset.dy or 0.0
self.dx = Offset.dx or 0.0 self.dx = Offset.dx or 0.0
self.rho = Offset.rho or 0.0 self.rho = Offset.rho or 0.0
@ -1624,8 +1628,6 @@ function ZONE_UNIT:New( ZoneName, ZoneUNIT, Radius, Offset)
self.relative_to_unit = Offset.relative_to_unit or false self.relative_to_unit = Offset.relative_to_unit or false
end end
local self = BASE:Inherit( self, ZONE_RADIUS:New( ZoneName, ZoneUNIT:GetVec2(), Radius, true ) )
self:F( { ZoneName, ZoneUNIT:GetVec2(), Radius } ) self:F( { ZoneName, ZoneUNIT:GetVec2(), Radius } )
self.ZoneUNIT = ZoneUNIT self.ZoneUNIT = ZoneUNIT

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

@ -514,7 +514,7 @@ function COMMANDER:AddOpsTransport(Transport)
Transport.commander=self Transport.commander=self
Transport.statusCommander=TRANSPORT.Status.PLANNED Transport.statusCommander=OPSTRANSPORT.Status.PLANNED
table.insert(self.transportqueue, Transport) table.insert(self.transportqueue, Transport)