epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make aircraftInfo in carryall private

Browse Source
This commit is contained in:
dnqbob
2023-08-19 16:19:49 +08:00
committed by Gustas
parent e07869e71f
commit 1692f32ffc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/Carryall.cs
View File

@@ -94,7 +94,7 @@ namespace OpenRA.Mods.Common.Traits
Carrying Carrying
} }
protected readonly AircraftInfo AircraftInfo; readonly AircraftInfo aircraftInfo;
readonly Aircraft aircraft; readonly Aircraft aircraft;
readonly BodyOrientation body; readonly BodyOrientation body;
readonly IFacing facing; readonly IFacing facing;
@@ -120,7 +120,7 @@ namespace OpenRA.Mods.Common.Traits
Carryable = null; Carryable = null;
State = CarryallState.Idle; State = CarryallState.Idle;
AircraftInfo = self.Info.TraitInfoOrDefault<AircraftInfo>(); aircraftInfo = self.Info.TraitInfoOrDefault<AircraftInfo>();
aircraft = self.Trait<Aircraft>(); aircraft = self.Trait<Aircraft>();
body = self.Trait<BodyOrientation>(); body = self.Trait<BodyOrientation>();
facing = self.Trait<IFacing>(); facing = self.Trait<IFacing>();
@@ -322,7 +322,7 @@ namespace OpenRA.Mods.Common.Traits
yield return new CarryallPickupOrderTargeter(Info); yield return new CarryallPickupOrderTargeter(Info);
yield return new DeployOrderTargeter("Unload", 10, yield return new DeployOrderTargeter("Unload", 10,
() => CanUnload() ? Info.UnloadCursor : Info.UnloadBlockedCursor); () => CanUnload() ? Info.UnloadCursor : Info.UnloadBlockedCursor);
yield return new CarryallDeliverUnitTargeter(AircraftInfo, Info); yield return new CarryallDeliverUnitTargeter(aircraftInfo, Info);
} }
} }
@@ -349,7 +349,7 @@ namespace OpenRA.Mods.Common.Traits
if (order.OrderString == "DeliverUnit") if (order.OrderString == "DeliverUnit")
{ {
var cell = self.World.Map.Clamp(self.World.Map.CellContaining(order.Target.CenterPosition)); var cell = self.World.Map.Clamp(self.World.Map.CellContaining(order.Target.CenterPosition));
if (!AircraftInfo.MoveIntoShroud && !self.Owner.Shroud.IsExplored(cell)) if (!aircraftInfo.MoveIntoShroud && !self.Owner.Shroud.IsExplored(cell))
return; return;
self.QueueActivity(order.Queued, new DeliverUnit(self, order.Target, Info.DropRange, Info.TargetLineColor)); self.QueueActivity(order.Queued, new DeliverUnit(self, order.Target, Info.DropRange, Info.TargetLineColor));