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: Allow calculation for palette in spritelayout #118

Merged
merged 3 commits into from May 10, 2020

Conversation

glx22
Copy link
Contributor

@glx22 glx22 commented May 6, 2020

frosch123
frosch123 previously approved these changes May 6, 2020
Copy link
Member

@frosch123 frosch123 left a comment

Choose a reason for hiding this comment

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

Related, I think there is a "<< 16" missing in line 219.

But this looks fine.

@glx22
Copy link
Contributor Author

glx22 commented May 7, 2020

Indeed there was a missing '<< 16', but I'm not even sure this code is used.

frosch123
frosch123 previously approved these changes May 7, 2020
Copy link
Member

@frosch123 frosch123 left a comment

Choose a reason for hiding this comment

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

I think it is used, when the value is computed via ActionD only and inserted as constant via Action6.

@glx22
Copy link
Contributor Author

glx22 commented May 7, 2020

It was used for param[] before my first commit, then it was unused, then I reintroduced its usage for both sprites and palettes.

nml/actions/action2layout.py Outdated Show resolved Hide resolved
@glx22 glx22 force-pushed the palette branch 2 times, most recently from eb60edf to eb27cf8 Compare May 8, 2020 22:47
Copy link
Member

@LordAro LordAro left a comment

Choose a reason for hiding this comment

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

Code looks fine

@glx22 glx22 merged commit c4c4465 into OpenTTD:master May 10, 2020
@glx22 glx22 deleted the palette branch May 10, 2020 20:42
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.

None yet

4 participants