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

Fix: Palettes must be defined in a specific order, not sorted by filename. #25

Merged
merged 1 commit into from
Nov 4, 2023

Conversation

PeterN
Copy link
Member

@PeterN PeterN commented Nov 4, 2023

Motivation

Old versions of grfcodec has the palettes defined in a specific order.

This got lost (probably with the move to CMake), and the palettes are sorted in the CMakeLists.txt by filename alphabetically.

Built-in palettes: use -p <number>, where <number> is one of the following:
	4  DOS TTD
	6  Windows TTD
	3  DOS TTD, Candyland
	5  Windows TTD, Candyland
	2  TT Original
	1  TT Original, Mars landscape

Description

Adjust CMakeLists.txt to get back to the intended order.

Built-in palettes: use -p <number>, where <number> is one of the following:
	1  DOS TTD
	2  Windows TTD
	3  DOS TTD, Candyland
	4  Windows TTD, Candyland
	5  TT Original
	6  TT Original, Mars landscape

@PeterN
Copy link
Member Author

PeterN commented Nov 4, 2023

I know #24 attempts to resolve this too, but I don't think that is correct. Any scripts using grfcodec would expect to use -p 1 or -p 2 normally.

Copy link
Contributor

@glx22 glx22 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup the order changed with 8ed61cf

@glx22 glx22 merged commit c363cee into OpenTTD:master Nov 4, 2023
8 checks passed
@PeterN PeterN deleted the fix-palette-sort-order branch November 5, 2023 19:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants