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

Feature/rct1 surfaces #13614

Merged
merged 3 commits into from Dec 21, 2020
Merged

Conversation

Gymnasiast
Copy link
Member

This uses a previously unused bit in the surface element to store extra surface styles.

Before:

Roman Village 2020-12-20 21-23-38

After:

Roman Village 2020-12-20 21-23-11

@@ -79,8 +79,7 @@ uint8_t RCT12SurfaceElement::GetSlope() const
uint32_t RCT12SurfaceElement::GetSurfaceStyle() const
{
uint32_t retVal = (terrain >> 5) & 7;
if (type & 1)
retVal |= (1 << 3);
retVal |= (type & RCT12_SURFACE_ELEMENT_TYPE_SURFACE_MASK) << 3;
Copy link
Contributor

Choose a reason for hiding this comment

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

Will this have issues with #13536. I assume not as this is only changing the RCT12 element and not the in memory element.

Copy link
Member Author

Choose a reason for hiding this comment

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

It should not affect #13536, indeed.

@Gymnasiast Gymnasiast merged commit 4ac3b27 into OpenRCT2:develop Dec 21, 2020
@Gymnasiast Gymnasiast deleted the feature/rct1-surfaces branch December 21, 2020 17:40
@tupaschoal tupaschoal added this to the v0.3.3 milestone Dec 21, 2020
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

3 participants