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

Add logic to disallowing On Hold on a queue. #14916

Merged
merged 1 commit into from Mar 18, 2018

Conversation

Projects
None yet
4 participants
@MustaphaTR
Copy link
Member

MustaphaTR commented Mar 15, 2018

Right clicking to an icon for such queue would instanly cancel, regardless of progress.

Generals did not have holding the production. I have broken On Hold while adding instant cash draining on queueing for my Generals Alpha mod. Wanted to properly implement a way of it on upsteam if someone wants to use.

@@ -35,6 +35,9 @@ public class ProductionQueueInfo : ITraitInfo
[Desc("Should the prerequisite remain enabled if the owner changes?")]
public readonly bool Sticky = true;

[Desc("Should right clicking on the icon instantly cancel the production instead of putting it on hold?")]
public readonly bool DisallowOnHold = false;

This comment has been minimized.

@pchote

pchote Mar 15, 2018

Member

Can we please call this DisallowPaused for consistency with the rest of the code?

{
// Instant cancel of things we have not started yet and things that are finished
// Instantly cancel things we have not started yet and things that are finished or if the queue doesn't allow on hold

This comment has been minimized.

@pchote

pchote Mar 15, 2018

Member

IMO the following would be a bit clearer: // Instantly cancel items that haven't started, have finished, or if the queue doesn't support pausing.

@MustaphaTR MustaphaTR force-pushed the MustaphaTR:disallow-on-hold branch from bcb9728 to 13c3dfb Mar 15, 2018

@MustaphaTR

This comment has been minimized.

Copy link
Member Author

MustaphaTR commented Mar 15, 2018

Updated.

@reaperrr reaperrr merged commit 356f24b into OpenRA:bleed Mar 18, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@reaperrr

This comment has been minimized.

Copy link
Contributor

reaperrr commented Mar 18, 2018

@MustaphaTR MustaphaTR deleted the MustaphaTR:disallow-on-hold branch Mar 18, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.