Fix duplicate unitfont.ttf in config/fonts.json #50610
Merged
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
actual-nh
added
0.F Backport Candidate
[C++]
ZhilkinSerg
added a commit
to ZhilkinSerg/Cataclysm-DDA
that referenced
this pull request
Aug 12, 2021
ZhilkinSerg
added a commit
that referenced
this pull request
Aug 14, 2021
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.
Summary
Bugfixes "Fix duplicate unitfont.ttf in config/fonts.json"
Purpose of change
When testing #50609 I found that
data/font/unifont.ttfappears twice in the generatedconfig/fonts.json.ensure_unifont_loaded()finds Unifont in the font list and inserts it if it does not exist. However in current implementation it doesn't take path into account and only search for plain stringunifont.ttf. The path of Unifont should bedata/font/unifont.ttf.Describe the solution
Replace
unitfont.ttfwithdata/font/unifont.ttf.Describe alternatives you've considered
None.
Testing
Now
config/fonts.jsononly contains one Unifont entry:{ "typeface": [ "data/font/unifont.ttf" ], "map_typeface": [ "data/font/unifont.ttf" ], "overmap_typeface": [ "data/font/unifont.ttf" ] }Additional context