Fix #1258: Add mixed hex and RGB(A) parsing to XMLColorToInt #1261
Conversation
This file contains hidden or 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
`XMLColorToInt` is used when parsing i.e. `color` attribute from map files on various elements such as vehicles, blips, radarareas, teams and so on. Before it only supported a single format for multi-value attributes. So now it is possible to specify separate colors like so: `#ff0, 255, 0, 0, #ff0000, #ffffff55` Which corresponds: yellow, red, red, transparent white
patrikjuvonen
changed the title
patrikjuvonen
changed the title
patrikjuvonen
changed the title
qaisjp
reviewed
Mar 22, 2020
patrikjuvonen
added a commit
that referenced
this pull request
Apr 28, 2020
patrikjuvonen
added a commit
that referenced
this pull request
Apr 28, 2020
…orToInt (#1261)"" This reverts commit 3f39bb5. Signed-off-by: Patrik Juvonen <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Summary
XMLColorToIntis used when parsing i.e.colorattribute from map files on various elements such as vehicles, blips, radarareas, teams and so on.Currently it only supports a single format for multi-value attributes (i.e. vehicles have many colors) and many elements don't support hex color format right now anyway, so this PR adds consistent color attribute behavior across all element types.
So now it is possible to specify separate colors like so:
Which corresponds to:
And works straight for vehicles.
But most importantly all elements now have consistent
colorbehavior, so for example blips, radarareas, teams can now be passed a hex color value and it will work.This PR closes #1258.
Tests
A test map file is available for download here.