Codechange: merge guiflags and flags in settings .ini files #9333
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rubidium42
reviewed
Jun 3, 2021
TrueBrain
changed the title
TrueBrain
changed the title
TrueBrain
force-pushed
the
settings-flags-not-saveload-flags
branch
2 times, most recently
from
6b51368
to
8563e4c
Compare
frosch123
reviewed
Jun 3, 2021
TrueBrain
force-pushed
the
settings-flags-not-saveload-flags
branch
3 times, most recently
from
1e5cf05
to
4faaceb
Compare
TrueBrain
commented
Jun 3, 2021
| @@ -578,7 +578,7 @@ static inline uint SlGetArrayLength(size_t length) | |||
| * @param conv VarType type of variable that is used for calculating the size | |||
| * @return Return the size of this type in bytes | |||
| */ | |||
| static inline uint SlCalcConvMemLen(VarType conv) | |||
| uint SlCalcConvMemLen(VarType conv) | |||
There was a problem hiding this comment.
In #9335 I revert this back to a static inline, but for my sanity (and yours) in this PR I first make it available for settings.cpp.
TrueBrain
changed the title
TrueBrain
force-pushed
the
settings-flags-not-saveload-flags
branch
from
4faaceb
to
2904dc4
Compare
It is a settings-only flag, so don't pollute SaveLoad code with it.
It is a settings-only flag, so don't pollute SaveLoad code with it.
It was rather confusing which one was for what, especially as some SaveLoad flags were settings-only. Clean up this mess a bit by having only Setting flags.
TrueBrain
force-pushed
the
settings-flags-not-saveload-flags
branch
from
2904dc4
to
6f7dcf1
Compare
rubidium42
approved these changes
Jun 6, 2021
glx22
added a commit
to glx22/OpenTTD
that referenced
this pull request
Apr 15, 2022
… for osk_activation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation / Problem
While working on SaveLoad I ran into the issue that it has two flags which have nothing to do with SaveLoad. Additionally, the Settings were settings SaveLoad settings directly, which gave for some confusing ini file ..
flagsvsguiflags.Description
Simplify the situation by only having
flags.This now means that
SF_NOT_IN_CONFIG,SF_NOT_IN_SAVEandSF_NO_NETWORK_SYNCremain within the Setting, and don't pollute SaveLoad for no good reason.Limitations
Checklist for review
Some things are not automated, and forgotten often. This list is a reminder for the reviewers.