Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove SequenceActivities. #16807

Merged
merged 1 commit into from Jul 20, 2019

Conversation

@tovl
Copy link
Contributor

commented Jul 19, 2019

As discussed on IRC.

Fixes #15632

@pchote pchote added this to the Next Release milestone Jul 19, 2019


var delta = (self.CenterPosition - host.CenterPosition).LengthSquared;
var transport = transportCallers.FirstOrDefault(t => t.MinimumDistance.LengthSquared < delta);
if (transport != null)
transport.RequestTransport(self, targetCell);

QueueChild(moveActivities);

This comment has been minimized.

Copy link
@reaperrr

reaperrr Jul 20, 2019

Contributor

We need to test this carefully. I'm not sure anymore, but it's possible this had to be queued after the transport request for a reason.

This comment has been minimized.

Copy link
@pchote

pchote Jul 20, 2019

Member

#16778 fixed the carryall logic messing with the activity queue, so this should be safe.

@pchote
pchote approved these changes Jul 20, 2019

@pchote pchote added the PR: Needs +2 label Jul 20, 2019

var move = new Move(self, cellInfo.Cell);
self.QueueActivity(ActivityUtils.SequenceActivities(notifyBlocking, waitFor, move));
self.QueueActivity(new CallFunc(() => self.NotifyBlocker(cellInfo.Cell)));
self.QueueActivity(new WaitFor(() => CanEnterCell(cellInfo.Cell)));

This comment has been minimized.

Copy link
@reaperrr

reaperrr Jul 20, 2019

Contributor

Out of scope for this PR, but for future reference: the two above look like they should become child activities of Move at some point, or even not be their own activities at all: we could do self.NotifyBlocker in OnFirstRun and make Tick return false early if !CanEnterCell.

@reaperrr reaperrr merged commit c5558e2 into OpenRA:bleed Jul 20, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.