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 #21748: TileElement out of bounds #21749

Merged
merged 2 commits into from
May 2, 2024

Conversation

janisozaur
Copy link
Member

This fixes crashes observed and allows the park to load. The park is overlarge and breaks some assumptions we have in our code.

@janisozaur janisozaur marked this pull request as ready for review April 7, 2024 21:48
@janisozaur janisozaur marked this pull request as draft April 7, 2024 22:07
@janisozaur janisozaur added this to the v0.4.11 milestone Apr 7, 2024
@janisozaur
Copy link
Member Author

Regression from #21399

This fixes crashes observed and allows the park to load. The park is
overlarge and breaks some assumptions we have in our code.
@janisozaur janisozaur marked this pull request as ready for review May 2, 2024 14:25
@janisozaur
Copy link
Member Author

I checked what #21399 modified and think the fix is correct.

@AaronVanGeffen
Copy link
Member

Good to hear the fix is working. I agree with @tupaschoal that ternaries might be better, code style-wise, though. Would you mind amending?

src/openrct2/world/Map.cpp Outdated Show resolved Hide resolved
src/openrct2/world/Map.cpp Outdated Show resolved Hide resolved
src/openrct2/world/Map.cpp Outdated Show resolved Hide resolved
@janisozaur janisozaur merged commit a088f76 into OpenRCT2:develop May 2, 2024
22 checks passed
@janisozaur janisozaur deleted the fix-21748 branch May 2, 2024 16:14
janisozaur added a commit that referenced this pull request May 5, 2024
- Feature: [#11512] Coloured usernames by group on multiplayer servers.
- Feature: [#21734] Park admittance price can now be set via text input.
- Feature: [#21957] [Plugin] Expose whether the game is paused to the plugin API.
- Improved: [#21728] “Fix all rides” cheat now also works if a mechanic is already fixing the ride.
- Improved: [#21769] Expose “animation is backwards” wall property in Tile Inspector.
- Improved: [#21855] Add a separator between “Load Game” and “Save Game”, to avoid accidental overwriting.
- Change: [#21715] [Plugin] Remove access to the internal `owner` property. Note: `ownership` is still accessible.
- Change: [#21855] Cheats menu dropdown no longer requires dragging.
- Change: [#21866] Hide the FPS Counter when the top toolbar/widgets have been toggled off.
- Change: [#21950] Construction and removal buttons can now be held down for repeated placement.
- Fix: [#866] Boat Hire boats get stuck entering track (original bug).
- Fix: [#10701] No reason specified when placing door over unsuitable track.
- Fix: [#18723, #21870] Attempting to demolish a flat ride in pause mode allows you to place multiple copies.
- Fix: [#19559] Custom rides with long descriptions extend into lower widgets.
- Fix: [#21696] Fullscreen window option not correctly applied on macOS.
- Fix: [#21749] Crash when loading park bigger than current limits.
- Fix: [#21787] Map generator heightmap should respect increased height limits.
- Fix: [#21829] When creating a new scenario, the default name contains formatting codes.
- Fix: [#21937] Build errors with the ORIGINAL_RATINGS flag.
- Fix: [objects#324] Cannot build Colosseum inside a turn or helix.
- Fix: [objects#325] Sloped castle walls are vertically offset by one pixel (original bug).
mrmbernardi pushed a commit to mrmbernardi/OpenRCT2 that referenced this pull request May 10, 2024
- Feature: [OpenRCT2#11512] Coloured usernames by group on multiplayer servers.
- Feature: [OpenRCT2#21734] Park admittance price can now be set via text input.
- Feature: [OpenRCT2#21957] [Plugin] Expose whether the game is paused to the plugin API.
- Improved: [OpenRCT2#21728] “Fix all rides” cheat now also works if a mechanic is already fixing the ride.
- Improved: [OpenRCT2#21769] Expose “animation is backwards” wall property in Tile Inspector.
- Improved: [OpenRCT2#21855] Add a separator between “Load Game” and “Save Game”, to avoid accidental overwriting.
- Change: [OpenRCT2#21715] [Plugin] Remove access to the internal `owner` property. Note: `ownership` is still accessible.
- Change: [OpenRCT2#21855] Cheats menu dropdown no longer requires dragging.
- Change: [OpenRCT2#21866] Hide the FPS Counter when the top toolbar/widgets have been toggled off.
- Change: [OpenRCT2#21950] Construction and removal buttons can now be held down for repeated placement.
- Fix: [OpenRCT2#866] Boat Hire boats get stuck entering track (original bug).
- Fix: [OpenRCT2#10701] No reason specified when placing door over unsuitable track.
- Fix: [OpenRCT2#18723, OpenRCT2#21870] Attempting to demolish a flat ride in pause mode allows you to place multiple copies.
- Fix: [OpenRCT2#19559] Custom rides with long descriptions extend into lower widgets.
- Fix: [OpenRCT2#21696] Fullscreen window option not correctly applied on macOS.
- Fix: [OpenRCT2#21749] Crash when loading park bigger than current limits.
- Fix: [OpenRCT2#21787] Map generator heightmap should respect increased height limits.
- Fix: [OpenRCT2#21829] When creating a new scenario, the default name contains formatting codes.
- Fix: [OpenRCT2#21937] Build errors with the ORIGINAL_RATINGS flag.
- Fix: [objects#324] Cannot build Colosseum inside a turn or helix.
- Fix: [objects#325] Sloped castle walls are vertically offset by one pixel (original bug).
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