-
-
Notifications
You must be signed in to change notification settings - Fork 957
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
Feature: Per-group wagon removal flag #7441
Conversation
@@ -65,6 +65,7 @@ struct GroupStatistics { | |||
|
|||
enum GroupFlags : uint8 { | |||
GF_REPLACE_PROTECTION, ///< If set to true, the global autoreplace has no effect on the group | |||
GF_END, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Put in a comment that CmdSetGroupFlag
is currently limited to 3 bits?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, yeah, this is wrong as I used GroupFlags as the storage type but the values within the enum are used to set bits. Perhaps it should be:
enum GroupFlag { ... }
typedef uint8 GroupFlags
or something.
481ed27
to
c1f356c
Compare
c1f356c
to
08d18c7
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Conflict needs resolving, and I'd like to see the above comments addressed as well
+1 to this one, I believe it's a straightforward improvement. |
08d18c7
to
9ab09d9
Compare
Resurrected. Storage type of group::flags is changed to uint8 as it is a bit-field, not directly GroupFlags. |
9ab09d9
to
1e36293
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Implements #5730.
Group::replace_protection is converted to a bitmap of flags.
Savegame conversion is there just to set the flag for existing groups for compatibility.