Skip to content

Feature/rct1 surfaces#13614

Merged
Gymnasiast merged 3 commits into
OpenRCT2:developfrom
Gymnasiast:feature/rct1-surfaces
Dec 21, 2020
Merged

Feature/rct1 surfaces#13614
Gymnasiast merged 3 commits into
OpenRCT2:developfrom
Gymnasiast:feature/rct1-surfaces

Conversation

@Gymnasiast

Copy link
Copy Markdown
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

@Gymnasiast Gymnasiast force-pushed the feature/rct1-surfaces branch from ba636b5 to 179b503 Compare December 20, 2020 20:45
uint32_t retVal = (terrain >> 5) & 7;
if (type & 1)
retVal |= (1 << 3);
retVal |= (type & RCT12_SURFACE_ELEMENT_TYPE_SURFACE_MASK) << 3;

Copy link
Copy Markdown
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
Copy Markdown
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.

Comment thread src/openrct2-ui/interface/LandTool.cpp
Comment thread src/openrct2/paint/tile_element/Paint.Surface.cpp
Comment thread src/openrct2/paint/tile_element/Paint.Surface.cpp
@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.

3 participants