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

Use Refinery reference in HarvesterDockSequence

Browse Source
This commit is contained in:
Gustas
2023-01-12 16:46:45 +02:00
committed by abcdefg30
parent f56b0ea0d0
commit f5aa2f153a
5 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Cnc/Activities/VoxelHarvesterDockSequence.cs
View File

@@ -20,11 +20,11 @@ namespace OpenRA.Mods.Cnc.Activities
readonly WithVoxelUnloadBody body;
readonly WithDockingOverlay spriteOverlay;
public VoxelHarvesterDockSequence(Actor self, Actor refinery, WAngle dockAngle, bool isDragRequired, in WVec dragOffset, int dragLength)
: base(self, refinery, dockAngle, isDragRequired, dragOffset, dragLength)
public VoxelHarvesterDockSequence(Actor self, Actor refineryActor, Refinery refinery)
: base(self, refineryActor, refinery)
{
body = self.Trait<WithVoxelUnloadBody>();
spriteOverlay = refinery.TraitOrDefault<WithDockingOverlay>();
spriteOverlay = RefineryActor.TraitOrDefault<WithDockingOverlay>();
}
public override void OnStateDock(Actor self)
@@ -49,7 +49,7 @@ namespace OpenRA.Mods.Cnc.Activities
// If body.Docked wasn't set, we didn't actually dock and have to skip the undock overlay
if (!body.Docked)
dockingState = DockingState.Complete;
else if (Refinery.IsInWorld && !Refinery.IsDead && spriteOverlay != null && !spriteOverlay.Visible)
else if (RefineryActor.IsInWorld && !RefineryActor.IsDead && spriteOverlay != null && !spriteOverlay.Visible)
{
dockingState = DockingState.Wait;
spriteOverlay.Visible = true;

2
OpenRA.Mods.Cnc/Traits/Buildings/TiberianSunRefinery.cs
View File

@@ -27,7 +27,7 @@ namespace OpenRA.Mods.Cnc.Traits
public override Activity DockSequence(Actor harv, Actor self)
{
return new VoxelHarvesterDockSequence(harv, self, DeliveryAngle, IsDragRequired, DragOffset, DragLength);
return new VoxelHarvesterDockSequence(harv, self, this);
}
}
}